Skip to content

Commit

Permalink
refactor: move cli to ckb-bin
Browse files Browse the repository at this point in the history
  • Loading branch information
driftluo committed Sep 24, 2024
1 parent 44afc93 commit 1d81452
Show file tree
Hide file tree
Showing 27 changed files with 1,177 additions and 1,150 deletions.
12 changes: 5 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ doc-test: ## Run doc tests

.PHONY: cli-test
cli-test: prod # Run ckb command line usage bats test
./util/app-config/src/tests/bats_tests/cli_test.sh
./ckb-bin/src/tests/bats_tests/cli_test.sh

.PHONY: test
test: ## Run all tests, including some tests can be time-consuming to execute (tagged with [ignore])
Expand Down
15 changes: 12 additions & 3 deletions ckb-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb"
repository = "https://github.com/nervosnetwork/ckb"

[dependencies]
clap = { version = "=4.4" }
clap = { version = "=4.4", features = ["string", "wrap_help"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
serde_plain = "0.3.0"
Expand All @@ -30,14 +30,17 @@ ckb-miner = { path = "../miner", version = "= 0.119.0-pre" }
ckb-network = { path = "../network", version = "= 0.119.0-pre" }
ckb-resource = { path = "../resource", version = "= 0.119.0-pre" }
ctrlc = { version = "3.1", features = ["termination"] }
ckb-instrument = { path = "../util/instrument", version = "= 0.119.0-pre", features = ["progress_bar"] }
ckb-instrument = { path = "../util/instrument", version = "= 0.119.0-pre", features = [
"progress_bar",
] }
ckb-build-info = { path = "../util/build-info", version = "= 0.119.0-pre" }
ckb-memory-tracker = { path = "../util/memory-tracker", version = "= 0.119.0-pre" }
ckb-chain-iter = { path = "../util/chain-iter", version = "= 0.119.0-pre" }
ckb-verification-traits = { path = "../verification/traits", version = "= 0.119.0-pre" }
ckb-async-runtime = { path = "../util/runtime", version = "= 0.119.0-pre" }
ckb-migrate = { path = "../util/migrate", version = "= 0.119.0-pre" }
ckb-launcher = { path = "../util/launcher", version = "= 0.119.0-pre" }
ckb-constant = { path = "../util/constant", version = "= 0.119.0-pre" }
base64 = "0.21.0"
tempfile.workspace = true
rayon = "1.0"
Expand All @@ -55,7 +58,13 @@ colored = "2.0"
[features]
deadlock_detection = ["ckb-util/deadlock_detection"]
profiling = ["ckb-memory-tracker/profiling", "ckb-shared/stats"]
with_sentry = ["sentry", "ckb-launcher/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry", "ckb-logger-service/with_sentry"]
with_sentry = [
"sentry",
"ckb-launcher/with_sentry",
"ckb-network/with_sentry",
"ckb-app-config/with_sentry",
"ckb-logger-service/with_sentry",
]
with_dns_seeding = ["ckb-network/with_dns_seeding"]
portable = ["ckb-launcher/portable"]
march-native = ["ckb-launcher/march-native"]
Loading

0 comments on commit 1d81452

Please sign in to comment.