Skip to content

Dedup dependencies between dependencies and dev-dependencies #9233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkchr merged 9 commits into from
Jul 22, 2025
Merged

Dedup dependencies between dependencies and dev-dependencies #9233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e9a9c4
Dedup deps between dependencies and dev-dependencies
dimartiro Jul 17, 2025
c726933
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 17, 2025
c14478d
Revert chain-spec-builder changes
dimartiro Jul 17, 2025
d4c9305
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 17, 2025
535be8e
Merge branch 'master' into remove-duplicate-deps
bkchr Jul 17, 2025
33887ba
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 21, 2025
842a14a
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 21, 2025
a4cea9c
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 22, 2025
b048ccb
Merge branch 'master' into remove-duplicate-deps
dimartiro Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bridges/modules/relayers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ sp-runtime = { workspace = true }
[dev-dependencies]
bp-parachains = { workspace = true }
bp-polkadot-core = { workspace = true }
bp-runtime = { workspace = true }
bp-test-utils = { workspace = true }
pallet-balances = { workspace = true, default-features = true }
pallet-utility = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }

[features]
default = ["std"]
Expand Down
1 change: 0 additions & 1 deletion bridges/modules/xcm-bridge-hub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ xcm-executor = { workspace = true }

[dev-dependencies]
bp-header-chain = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
pallet-balances = { workspace = true }
pallet-xcm-bridge-hub-router = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion bridges/primitives/messages/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ sp-io = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
bp-runtime = { workspace = true }
hex = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }

Expand Down
3 changes: 0 additions & 3 deletions cumulus/client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ rstest = { workspace = true }
tokio = { features = ["macros"], workspace = true, default-features = true }

# Substrate
sc-client-api = { workspace = true, default-features = true }
sp-consensus = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
sp-keystore = { workspace = true, default-features = true }

Expand Down
3 changes: 0 additions & 3 deletions cumulus/client/pov-recovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,3 @@ tokio = { features = ["macros"], workspace = true, default-features = true }

# Cumulus
cumulus-test-client = { workspace = true }

# Substrate
sc-client-api = { workspace = true, default-features = true }
1 change: 0 additions & 1 deletion cumulus/client/relay-chain-inprocess-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,4 @@ sp-keyring = { workspace = true, default-features = true }

# Polkadot
metered = { features = ["futures_channel"], workspace = true }
polkadot-primitives = { workspace = true, default-features = true }
polkadot-test-client = { workspace = true }
6 changes: 0 additions & 6 deletions cumulus/test/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,6 @@ pallet-timestamp = { workspace = true, default-features = true }
cumulus-test-client = { workspace = true }
futures = { workspace = true }

# Polkadot dependencies
polkadot-test-service = { workspace = true }

# Substrate dependencies
sc-cli = { workspace = true, default-features = true }

[features]
runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/core/approval-voting-parallel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ rand_core = { workspace = true }

[dev-dependencies]
assert_matches = { workspace = true }
async-trait = { workspace = true }
kvdb-memorydb = { workspace = true }
polkadot-node-subsystem-test-helpers = { workspace = true, default-features = true }
schnorrkel = { workspace = true, default-features = true }
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/core/approval-voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ sp-runtime = { workspace = true }

[dev-dependencies]
assert_matches = { workspace = true }
async-trait = { workspace = true }
kvdb-memorydb = { workspace = true }
parking_lot = { workspace = true, default-features = true }
polkadot-node-subsystem-test-helpers = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/core/av-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ sp-tracing = { workspace = true }

parking_lot = { workspace = true, default-features = true }
polkadot-node-subsystem-test-helpers = { workspace = true }
polkadot-node-subsystem-util = { workspace = true, default-features = true }
polkadot-primitives-test-helpers = { workspace = true }
sp-core = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
1 change: 0 additions & 1 deletion polkadot/node/core/pvf/prepare-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ tikv-jemalloc-ctl = { workspace = true }
[dev-dependencies]
criterion = { features = ["cargo_bench_support"], workspace = true }
rococo-runtime = { workspace = true }
sp-maybe-compressed-blob = { workspace = true, default-features = true }

[features]
builder = []
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/malus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ polkadot-node-core-pvf-prepare-worker = { workspace = true, default-features = t
[dev-dependencies]
futures = { features = ["thread-pool"], workspace = true }
polkadot-node-subsystem-test-helpers = { workspace = true }
sp-core = { workspace = true, default-features = true }

[build-dependencies]
substrate-build-script-utils = { workspace = true, default-features = true }
Expand Down
2 changes: 0 additions & 2 deletions polkadot/node/network/availability-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ polkadot-node-subsystem-test-helpers = { workspace = true }
polkadot-primitives-test-helpers = { workspace = true }
polkadot-subsystem-bench = { workspace = true }
rstest = { workspace = true }
sc-network = { workspace = true, default-features = true }
sp-core = { features = ["std"], workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }

Expand Down
1 change: 0 additions & 1 deletion polkadot/node/network/availability-recovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ assert_matches = { workspace = true }
futures-timer = { workspace = true }
rstest = { workspace = true }

sc-network = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/network/dispute-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ thiserror = { workspace = true }
assert_matches = { workspace = true }
async-channel = { workspace = true }
async-trait = { workspace = true }
futures-timer = { workspace = true }
polkadot-node-subsystem-test-helpers = { workspace = true }
polkadot-primitives-test-helpers = { workspace = true }
sc-keystore = { workspace = true, default-features = true }
Expand Down
1 change: 0 additions & 1 deletion polkadot/node/network/statement-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ thiserror = { workspace = true }
[dev-dependencies]
assert_matches = { workspace = true }
async-channel = { workspace = true }
futures-timer = { workspace = true }
polkadot-node-subsystem-test-helpers = { workspace = true }
polkadot-primitives = { workspace = true, features = ["test"] }
polkadot-primitives-test-helpers = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion polkadot/parachain/test-parachains/adder/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-
polkadot-parachain-primitives = { workspace = true, default-features = true }
polkadot-test-service = { workspace = true }

sc-service = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }

tokio = { features = ["macros"], workspace = true, default-features = true }
1 change: 0 additions & 1 deletion polkadot/parachain/test-parachains/undying/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-
polkadot-parachain-primitives = { workspace = true, default-features = true }
polkadot-test-service = { workspace = true }

sc-service = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }

tokio = { features = ["macros"], workspace = true, default-features = true }
1 change: 0 additions & 1 deletion polkadot/xcm/xcm-runtime-apis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ sp-io = { workspace = true }
sp-tracing = { workspace = true, default-features = true }
tracing = { workspace = true }
xcm-builder = { workspace = true }
xcm-executor = { workspace = true }
xcm-simulator = { workspace = true, default-features = true }

[features]
Expand Down
2 changes: 0 additions & 2 deletions substrate/bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,10 @@ node-rpc = { workspace = true }
[dev-dependencies]
assert_cmd = { workspace = true }
criterion = { features = ["async_tokio"], workspace = true, default-features = true }
futures = { workspace = true }
nix = { features = ["signal"], workspace = true }
pretty_assertions.workspace = true
regex = { workspace = true }
scale-info = { features = ["derive", "serde"], workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
soketto = { workspace = true }
sp-keyring = { workspace = true }
tempfile = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion substrate/client/consensus/grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ thiserror = { workspace = true }
[dev-dependencies]
assert_matches = { workspace = true }
finality-grandpa = { features = ["derive-codec", "test-helpers"], workspace = true, default-features = true }
sc-network = { workspace = true, default-features = true }
sc-network-test = { workspace = true }
sp-keyring = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }
Expand Down
1 change: 0 additions & 1 deletion substrate/client/consensus/grandpa/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ thiserror = { workspace = true }
sc-block-builder = { workspace = true, default-features = true }
sc-rpc = { features = ["test-helpers"], workspace = true, default-features = true }
sp-consensus-grandpa = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
substrate-test-runtime-client = { workspace = true }
tokio = { features = ["macros"], workspace = true, default-features = true }
2 changes: 0 additions & 2 deletions substrate/client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ zeroize = { workspace = true, default-features = true }

[dev-dependencies]
assert_matches = { workspace = true }
mockall = { workspace = true }
multistream-select = { workspace = true }
rand = { workspace = true, default-features = true }
sc-block-builder = { workspace = true, default-features = true }
sp-consensus = { workspace = true, default-features = true }
sp-crypto-hashing = { workspace = true, default-features = true }
Expand Down
1 change: 0 additions & 1 deletion substrate/client/network/sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ tokio = { features = ["macros", "time"], workspace = true, default-features = tr
tokio-stream = { workspace = true }

[dev-dependencies]
mockall = { workspace = true }
quickcheck = { workspace = true }
sc-block-builder = { workspace = true, default-features = true }
sp-test-primitives = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion substrate/client/offchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ async-trait = { workspace = true }
sc-block-builder = { workspace = true, default-features = true }
sc-client-db = { default-features = true, workspace = true }
sc-transaction-pool = { workspace = true, default-features = true }
sc-transaction-pool-api = { workspace = true, default-features = true }
sp-consensus = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }
substrate-test-runtime-client = { workspace = true }
Expand Down
2 changes: 0 additions & 2 deletions substrate/client/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ tokio = { workspace = true, default-features = true }
[dev-dependencies]
assert_matches = { workspace = true }
pretty_assertions = { workspace = true }
sc-block-builder = { workspace = true, default-features = true }
sc-network = { workspace = true, default-features = true }
sc-transaction-pool = { workspace = true, default-features = true }
sp-consensus = { workspace = true, default-features = true }
sp-crypto-hashing = { workspace = true, default-features = true }
substrate-test-runtime-client = { workspace = true }
tokio = { workspace = true, default-features = true }

[features]
test-helpers = []
1 change: 0 additions & 1 deletion substrate/client/transaction-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ sp-consensus = { workspace = true, default-features = true }
substrate-test-runtime = { workspace = true }
substrate-test-runtime-client = { workspace = true }
substrate-test-runtime-transaction-pool = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tracing-subscriber = { workspace = true }
txtesttool = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion substrate/frame/election-provider-multi-block/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ rand = { features = ["alloc", "small_rng"], optional = true, workspace = true }
frame-benchmarking = { workspace = true, default-features = true }
pallet-balances = { workspace = true, default-features = true }
parking_lot = { workspace = true, default-features = true }
sp-core = { workspace = true }
sp-io = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }

Expand Down
1 change: 0 additions & 1 deletion substrate/frame/election-provider-multi-phase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ frame-benchmarking = { workspace = true, default-features = true }
pallet-balances = { workspace = true, default-features = true }
parking_lot = { workspace = true, default-features = true }
rand = { workspace = true, default-features = true }
sp-npos-elections = { workspace = true }
sp-tracing = { workspace = true, default-features = true }


Expand Down
1 change: 0 additions & 1 deletion substrate/frame/revive/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pallet-revive-fixtures = { workspace = true, default-features = true }
pretty_assertions = { workspace = true }
static_init = { workspace = true }
substrate-cli-test-utils = { workspace = true }
subxt-signer = { workspace = true, features = ["unstable-eth"] }

[build-dependencies]
git2 = { workspace = true }
1 change: 0 additions & 1 deletion substrate/frame/staking-async/ah-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ scale-info = { workspace = true, features = ["derive"] }
serde = { features = ["alloc", "derive"], workspace = true }

sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-staking = { workspace = true }

Expand Down
1 change: 1 addition & 0 deletions substrate/frame/staking-async/ah-client/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ impl Config for Test {
type WeightInfo = ();
}

#[cfg(test)]
pub fn new_test_ext() -> sp_io::TestExternalities {
frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
}
1 change: 0 additions & 1 deletion substrate/test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ sc-chain-spec = { workspace = true, default-features = true }
sc-executor = { workspace = true, default-features = true }
sc-executor-common = { workspace = true, default-features = true }
serde = { features = ["alloc", "derive"], workspace = true }
serde_json = { features = ["alloc"], workspace = true }
sp-consensus = { workspace = true, default-features = true }
sp-tracing = { workspace = true, default-features = true }
substrate-test-runtime-client = { workspace = true }
Expand Down
Loading