From 2a93afe9557c7f41b8376868dc1534ce4d4581ba Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 17 Nov 2023 17:41:00 +0800 Subject: [PATCH] Fix check-cargotoml.sh --- Cargo.lock | 9 ++------- util/launcher/Cargo.toml | 5 ++--- util/launcher/src/lib.rs | 3 --- util/migrate/Cargo.toml | 9 +++++---- util/migrate/src/lib.rs | 3 +++ 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28c48cd3ac..cce0b90646 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -877,11 +877,9 @@ dependencies = [ "ckb-chain-spec", "ckb-channel", "ckb-db", - "ckb-db-migration", "ckb-db-schema", "ckb-error", "ckb-freezer", - "ckb-hash", "ckb-jsonrpc-types", "ckb-light-client-protocol-server", "ckb-logger", @@ -896,12 +894,10 @@ dependencies = [ "ckb-snapshot", "ckb-store", "ckb-sync", - "ckb-systemtime", "ckb-tx-pool", "ckb-types", "ckb-verification", "ckb-verification-traits", - "num_cpus", "once_cell", "tempfile", ] @@ -1036,15 +1032,14 @@ dependencies = [ "ckb-app-config", "ckb-chain-spec", "ckb-db", + "ckb-db-migration", "ckb-db-schema", "ckb-error", "ckb-hash", - "ckb-logger", + "ckb-migration-template", "ckb-store", "ckb-systemtime", "ckb-types", - "console", - "indicatif", "num_cpus", "tempfile", ] diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index bb6f4b36e9..055c3609d8 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -40,11 +40,10 @@ ckb-tx-pool = { path = "../../tx-pool", version = "= 0.113.0-pre" } ckb-light-client-protocol-server = { path = "../light-client-protocol-server", version = "= 0.113.0-pre" } ckb-block-filter = { path = "../../block-filter", version = "= 0.113.0-pre" } ckb-migrate = { path = "../migrate", version = "= 0.113.0-pre" } -num_cpus = "1.10" once_cell = "1.8.0" tempfile.workspace = true [features] with_sentry = [ "ckb-sync/with_sentry", "ckb-network/with_sentry", "ckb-app-config/with_sentry" ] -portable = ["ckb-db/portable", "ckb-db-migration/portable"] -march-native = ["ckb-db/march-native", "ckb-db-migration/march-native"] +portable = ["ckb-db/portable", "ckb-migrate/portable"] +march-native = ["ckb-db/march-native", "ckb-migrate/march-native"] diff --git a/util/launcher/src/lib.rs b/util/launcher/src/lib.rs index 48458947d3..bc4d1bf517 100644 --- a/util/launcher/src/lib.rs +++ b/util/launcher/src/lib.rs @@ -2,9 +2,6 @@ //! //! ckb launcher is helps to launch ckb node. -// declare here for mute ./devtools/ci/check-cargotoml.sh error -extern crate num_cpus; - mod shared_builder; use ckb_app_config::{ diff --git a/util/migrate/Cargo.toml b/util/migrate/Cargo.toml index 75b6084c07..151d6db6d4 100644 --- a/util/migrate/Cargo.toml +++ b/util/migrate/Cargo.toml @@ -13,7 +13,6 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] ckb-migration-template = { path = "migration-template", version = "= 0.113.0-pre" } ckb-db = { path = "../../db", version = "= 0.113.0-pre" } -ckb-logger = { path = "../logger", version = "= 0.113.0-pre" } ckb-error = { path = "../../error", version = "= 0.113.0-pre" } ckb-db-schema = { path = "../../db-schema", version = "= 0.113.0-pre" } ckb-db-migration = { path = "../../db-migration", version = "= 0.113.0-pre" } @@ -21,11 +20,13 @@ ckb-app-config = { path = "../app-config", version = "= 0.113.0-pre" } ckb-types = { path = "../types", version = "= 0.113.0-pre" } ckb-store = { path = "../../store", version = "= 0.113.0-pre" } ckb-chain-spec = { path = "../../spec", version = "= 0.113.0-pre" } -indicatif = "0.16" -console = ">=0.9.1, <1.0.0" ckb-hash = { path = "../hash", version = "= 0.113.0-pre" } -num_cpus = "1.10" tempfile.workspace = true +num_cpus = "1.10" [dev-dependencies] ckb-systemtime = {path = "../systemtime", version = "= 0.113.0-pre", features = ["enable_faketime"] } + +[features] +portable = ["ckb-db/portable", "ckb-db-migration/portable"] +march-native = ["ckb-db/march-native", "ckb-db-migration/march-native"] diff --git a/util/migrate/src/lib.rs b/util/migrate/src/lib.rs index dd9f424cc8..1abc638f5a 100644 --- a/util/migrate/src/lib.rs +++ b/util/migrate/src/lib.rs @@ -2,6 +2,9 @@ //! //! ckb migrate help to migrate CKB's data on schema change. +// declare here for mute ./devtools/ci/check-cargotoml.sh error +extern crate num_cpus; + pub mod migrate; mod migrations; #[cfg(test)]