From 0ba97b43ad36f6d0dd67293128ab00e60af32ada Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Sun, 19 Nov 2023 00:35:38 +0800 Subject: [PATCH] `ckb-launcher` use `ckb-shared` portable and march-native feature --- Cargo.lock | 10 ---------- shared/Cargo.toml | 4 ++-- util/launcher/Cargo.toml | 14 ++------------ 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c38cb4271..d517d8d08d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,32 +872,22 @@ dependencies = [ "ckb-block-filter", "ckb-build-info", "ckb-chain", - "ckb-chain-spec", "ckb-channel", - "ckb-db", - "ckb-db-schema", - "ckb-error", - "ckb-freezer", "ckb-jsonrpc-types", "ckb-light-client-protocol-server", "ckb-logger", - "ckb-migrate", "ckb-network", "ckb-network-alert", - "ckb-notify", "ckb-proposal-table", "ckb-resource", "ckb-rpc", "ckb-shared", - "ckb-snapshot", "ckb-store", "ckb-sync", "ckb-tx-pool", "ckb-types", "ckb-verification", "ckb-verification-traits", - "once_cell", - "tempfile", ] [[package]] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 58f1336db0..ac19a4b885 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -37,5 +37,5 @@ tempfile.workspace = true ckb-systemtime = { path = "../util/systemtime", version = "= 0.113.0-pre", features = ["enable_faketime"] } [features] -portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable"] -march-native = ["ckb-db/march-native", "ckb-store/march-native", "ckb-tx-pool/march-native"] +portable = ["ckb-db/portable", "ckb-store/portable", "ckb-tx-pool/portable", "ckb-migrate/portable"] +march-native = ["ckb-db/march-native", "ckb-store/march-native", "ckb-tx-pool/march-native", "ckb-migrate/march-native"] diff --git a/util/launcher/Cargo.toml b/util/launcher/Cargo.toml index 055c3609d8..2c4d2b7dba 100644 --- a/util/launcher/Cargo.toml +++ b/util/launcher/Cargo.toml @@ -13,11 +13,8 @@ repository = "https://github.com/nervosnetwork/ckb" [dependencies] ckb-types = { path = "../types", version = "= 0.113.0-pre" } ckb-store = { path = "../../store", version = "= 0.113.0-pre" } -ckb-db = { path = "../../db", version = "= 0.113.0-pre" } ckb-app-config = { path = "../app-config", version = "= 0.113.0-pre" } ckb-logger = { path = "../logger", version = "= 0.113.0-pre" } -ckb-db-schema = { path = "../../db-schema", version = "= 0.113.0-pre" } -ckb-error = { path = "../../error", version = "= 0.113.0-pre" } ckb-build-info = { path = "../build-info", version = "= 0.113.0-pre" } ckb-jsonrpc-types = { path = "../jsonrpc-types", version = "= 0.113.0-pre" } ckb-chain = { path = "../../chain", version = "= 0.113.0-pre" } @@ -32,18 +29,11 @@ ckb-verification-traits = { path = "../../verification/traits", version = "= 0.1 ckb-async-runtime = { path = "../runtime", version = "= 0.113.0-pre" } ckb-proposal-table = { path = "../proposal-table", version = "= 0.113.0-pre" } ckb-channel = { path = "../channel", version = "= 0.113.0-pre" } -ckb-chain-spec = { path = "../../spec", version = "= 0.113.0-pre" } -ckb-freezer = { path = "../../freezer", version = "= 0.113.0-pre" } -ckb-notify = { path = "../../notify", version = "= 0.113.0-pre" } -ckb-snapshot = { path = "../snapshot", version = "= 0.113.0-pre" } 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" } -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-migrate/portable"] -march-native = ["ckb-db/march-native", "ckb-migrate/march-native"] +portable = ["ckb-shared/portable"] +march-native = ["ckb-shared/march-native"]