diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml index bdc0236e368faeb24b6dc5e95aebe9e48c06a292..f59a5f9f778dfe723cdd15ced2e6c7fdaa64983e 100644 --- a/cumulus/client/cli/Cargo.toml +++ b/cumulus/client/cli/Cargo.toml @@ -18,9 +18,9 @@ url = { workspace = true } # Substrate sc-chain-spec = { workspace = true, default-features = true } -sc-cli = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = false } sc-client-api = { workspace = true, default-features = true } -sc-service = { workspace = true, default-features = true } +sc-service = { workspace = true, default-features = false } sp-blockchain = { workspace = true, default-features = true } sp-core = { workspace = true, default-features = true } sp-runtime = { workspace = true, default-features = true } diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml index 1307ec76de85ccbe2d36f2ba31b776205165fa8f..920a312deb5e0980c9e31d752a0001e2bbb6142e 100644 --- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml +++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml @@ -17,7 +17,7 @@ futures = { workspace = true } futures-timer = { workspace = true } # Substrate -sc-cli = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = false } sc-client-api = { workspace = true, default-features = true } sc-sysinfo = { workspace = true, default-features = true } sc-telemetry = { workspace = true, default-features = true } diff --git a/cumulus/polkadot-omni-node/lib/Cargo.toml b/cumulus/polkadot-omni-node/lib/Cargo.toml index 9cc4c0c635b53f331e1ebe6030a2c12f3ec4538a..5c3d6821defa4ab4d9a6a96c7000cb70e0206752 100644 --- a/cumulus/polkadot-omni-node/lib/Cargo.toml +++ b/cumulus/polkadot-omni-node/lib/Cargo.toml @@ -44,7 +44,7 @@ pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-feature prometheus-endpoint = { workspace = true, default-features = true } sc-basic-authorship = { workspace = true, default-features = true } sc-chain-spec = { workspace = true, default-features = true } -sc-cli = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = false } sc-client-api = { workspace = true, default-features = true } sc-client-db = { workspace = true, default-features = true } sc-consensus = { workspace = true, default-features = true } @@ -54,7 +54,7 @@ sc-network = { workspace = true, default-features = true } sc-offchain = { workspace = true, default-features = true } sc-rpc = { workspace = true, default-features = true } sc-runtime-utilities = { workspace = true, default-features = true } -sc-service = { workspace = true, default-features = true } +sc-service = { workspace = true, default-features = false } sc-sysinfo = { workspace = true, default-features = true } sc-telemetry = { workspace = true, default-features = true } sc-tracing = { workspace = true, default-features = true } diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml index 8d15391b11c2a275cf9cf85c4f5d29538ace0e75..105bb086dc6727a1d8b46ce2c0907b5e819c701f 100644 --- a/polkadot/node/metrics/Cargo.toml +++ b/polkadot/node/metrics/Cargo.toml @@ -18,14 +18,13 @@ gum = { workspace = true, default-features = true } metered = { features = ["futures_channel"], workspace = true } # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`. -sc-cli = { workspace = true } -sc-service = { workspace = true, default-features = true } - bs58 = { features = ["alloc"], workspace = true, default-features = true } codec = { workspace = true, default-features = true } log = { workspace = true, default-features = true } polkadot-primitives = { workspace = true, default-features = true } prometheus-endpoint = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = false } +sc-service = { workspace = true, default-features = false } sc-tracing = { workspace = true, default-features = true } [dev-dependencies] diff --git a/prdoc/pr_7649.prdoc b/prdoc/pr_7649.prdoc new file mode 100644 index 0000000000000000000000000000000000000000..eb10085ab64ddbdec6a42d7ffe977f1e9f68c3bb --- /dev/null +++ b/prdoc/pr_7649.prdoc @@ -0,0 +1,20 @@ +title: 'frame-benchmarking-cli should not build RocksDB by default' + +doc: + - audience: Node Dev + description: |- + This PR ensures `frame-benchmarking-cli` does not build RocksDB by default and also ensures rocksDB is not built when `default-features=false`. + +crates: + - name: cumulus-client-cli + bump: patch + - name: sc-cli + bump: patch + - name: polkadot-node-metrics + bump: patch + - name: frame-benchmarking-cli + bump: patch + - name: cumulus-relay-chain-inprocess-interface + bump: patch + - name: polkadot-omni-node-lib + bump: patch diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml index d7b4489b6cc5f842106bbfaea73daaeea77f0268..0ee2e24c9a8b3a6f68873a0176e3bd8f00c6413e 100644 --- a/substrate/client/cli/Cargo.toml +++ b/substrate/client/cli/Cargo.toml @@ -35,11 +35,11 @@ thiserror = { workspace = true } # personal fork here as workaround for: https://github.com/rust-bitcoin/rust-bip39/pull/64 bip39 = { package = "parity-bip39", version = "2.0.1", features = ["rand"] } sc-client-api = { workspace = true, default-features = true } -sc-client-db = { workspace = true } +sc-client-db = { workspace = true, default-features = false } sc-keystore = { workspace = true, default-features = true } sc-mixnet = { workspace = true, default-features = true } sc-network = { workspace = true, default-features = true } -sc-service = { workspace = true } +sc-service = { workspace = true, default-features = false } sc-telemetry = { workspace = true, default-features = true } sc-tracing = { workspace = true, default-features = true } sc-transaction-pool = { workspace = true, default-features = true } diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml index b11e67bc49bcab221af4ab7394c040017d28fe32..1c860e8d429975cca70c600477abc5f270c6f5c1 100644 --- a/substrate/test-utils/cli/Cargo.toml +++ b/substrate/test-utils/cli/Cargo.toml @@ -22,8 +22,8 @@ nix = { features = ["signal"], workspace = true } node-cli = { workspace = true } node-primitives = { workspace = true, default-features = true } regex = { workspace = true } -sc-cli = { workspace = true, default-features = true } -sc-service = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = false } +sc-service = { workspace = true, default-features = false } sp-rpc = { workspace = true, default-features = true } substrate-rpc-client = { workspace = true, default-features = true } tokio = { features = ["full"], workspace = true, default-features = true } diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml index b0709f4e244d96ef097848dde3ccd3bc86e02451..454b20c95c1ed418e3029418af22c28b8d0dc59d 100644 --- a/substrate/test-utils/client/Cargo.toml +++ b/substrate/test-utils/client/Cargo.toml @@ -23,10 +23,10 @@ futures = { workspace = true } sc-client-api = { workspace = true, default-features = true } sc-client-db = { features = [ "test-helpers", -], workspace = true } +], workspace = true, default-features = false } sc-consensus = { workspace = true, default-features = true } sc-executor = { workspace = true, default-features = true } -sc-service = { workspace = true } +sc-service = { workspace = true, default-features = false } serde = { workspace = true, default-features = true } serde_json = { workspace = true, default-features = true } sp-blockchain = { workspace = true, default-features = true } diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml index c38a7e4f77d812f2d22e7b9dcbff52d4459358cc..a4c93a5235de395a23a3df0c4eefad3aa6dd92ef 100644 --- a/substrate/utils/frame/benchmarking-cli/Cargo.toml +++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml @@ -39,13 +39,13 @@ rand = { features = ["small_rng"], workspace = true, default-features = true } rand_pcg = { workspace = true } sc-block-builder = { workspace = true, default-features = true } sc-chain-spec = { workspace = true } -sc-cli = { workspace = true } +sc-cli = { workspace = true, default-features = false } sc-client-api = { workspace = true, default-features = true } -sc-client-db = { workspace = true } +sc-client-db = { workspace = true, default-features = false } sc-executor = { workspace = true, default-features = true } sc-executor-common = { workspace = true } sc-runtime-utilities = { workspace = true, default-features = true } -sc-service = { workspace = true } +sc-service = { workspace = true, default-features = false } sc-sysinfo = { workspace = true, default-features = true } serde = { workspace = true, default-features = true } serde_json = { workspace = true, default-features = true } @@ -79,7 +79,7 @@ substrate-test-runtime = { workspace = true, default-features = true } westend-runtime = { workspace = true, default-features = true } [features] -default = ["rocksdb"] +default = [] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks",