From 9d6c0f446a0b3d5774a2d667b67ecce2d4655209 Mon Sep 17 00:00:00 2001 From: Branislav Kontur <bkontur@gmail.com> Date: Tue, 9 Apr 2024 10:45:44 +0200 Subject: [PATCH] Removed unused deps from Snowbridge deps (#4029) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher <git@kchr.de> --- Cargo.lock | 96 --------------- .../pallets/ethereum-client/Cargo.toml | 9 -- .../ethereum-client/fixtures/Cargo.toml | 10 -- .../pallets/inbound-queue/Cargo.toml | 9 -- .../pallets/inbound-queue/fixtures/Cargo.toml | 10 -- .../pallets/outbound-queue/Cargo.toml | 6 - .../outbound-queue/runtime-api/Cargo.toml | 4 - bridges/snowbridge/pallets/system/Cargo.toml | 5 - .../pallets/system/runtime-api/Cargo.toml | 2 - .../snowbridge/primitives/beacon/Cargo.toml | 3 - .../snowbridge/primitives/ethereum/Cargo.toml | 4 - .../snowbridge/primitives/router/Cargo.toml | 11 -- .../runtime/runtime-common/Cargo.toml | 3 - .../snowbridge/runtime/test-common/Cargo.toml | 111 +----------------- .../snowbridge/runtime/test-common/src/lib.rs | 1 - .../tests/assets/asset-hub-rococo/Cargo.toml | 2 - .../tests/assets/asset-hub-westend/Cargo.toml | 1 - .../bridges/bridge-hub-rococo/Cargo.toml | 2 - .../bridges/bridge-hub-westend/Cargo.toml | 1 - 19 files changed, 2 insertions(+), 288 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2145a870e75..3a92e262395 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,23 +177,11 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef" dependencies = [ - "alloy-rlp-derive", "arrayvec 0.7.4", "bytes", "smol_str", ] -[[package]] -name = "alloy-rlp-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - [[package]] name = "alloy-sol-macro" version = "0.4.2" @@ -831,7 +819,6 @@ dependencies = [ "assert_matches", "asset-hub-rococo-runtime", "asset-test-utils", - "cumulus-pallet-parachain-system", "emulated-integration-tests-common", "frame-support", "pallet-asset-conversion", @@ -847,7 +834,6 @@ dependencies = [ "sp-runtime", "staging-xcm", "staging-xcm-executor", - "testnet-parachains-constants", ] [[package]] @@ -969,7 +955,6 @@ dependencies = [ "sp-runtime", "staging-xcm", "staging-xcm-executor", - "testnet-parachains-constants", "westend-runtime", "westend-system-emulated-network", ] @@ -1954,7 +1939,6 @@ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ "asset-hub-rococo-runtime", - "bp-messages", "bridge-hub-rococo-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -1972,7 +1956,6 @@ dependencies = [ "rococo-westend-system-emulated-network", "scale-info", "snowbridge-core", - "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", @@ -2139,7 +2122,6 @@ dependencies = [ name = "bridge-hub-westend-integration-tests" version = "1.0.0" dependencies = [ - "bp-messages", "bridge-hub-westend-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -18178,7 +18160,6 @@ version = "0.2.0" dependencies = [ "byte-slice-cast", "frame-support", - "frame-system", "hex", "hex-literal", "parity-scale-codec", @@ -18193,7 +18174,6 @@ dependencies = [ "sp-std 14.0.0", "ssz_rs", "ssz_rs_derive", - "static_assertions", ] [[package]] @@ -18231,12 +18211,10 @@ dependencies = [ "parity-scale-codec", "rand 0.8.5", "rlp", - "rustc-hex", "scale-info", "serde", "serde-big-array", "serde_json", - "sp-core", "sp-io", "sp-runtime", "sp-std 14.0.0", @@ -18282,17 +18260,13 @@ dependencies = [ "snowbridge-core", "snowbridge-outbound-queue-merkle-tree", "sp-api", - "sp-core", "sp-std 14.0.0", - "staging-xcm", ] [[package]] name = "snowbridge-pallet-ethereum-client" version = "0.2.0" dependencies = [ - "bp-runtime", - "byte-slice-cast", "frame-benchmarking", "frame-support", "frame-system", @@ -18301,7 +18275,6 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "rand 0.8.5", - "rlp", "scale-info", "serde", "serde_json", @@ -18314,8 +18287,6 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-std 14.0.0", - "ssz_rs", - "ssz_rs_derive", "static_assertions", ] @@ -18323,9 +18294,6 @@ dependencies = [ name = "snowbridge-pallet-ethereum-client-fixtures" version = "0.9.0" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", @@ -18338,21 +18306,18 @@ name = "snowbridge-pallet-inbound-queue" version = "0.2.0" dependencies = [ "alloy-primitives", - "alloy-rlp", "alloy-sol-types", "frame-benchmarking", "frame-support", "frame-system", "hex-literal", "log", - "num-traits", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "snowbridge-beacon-primitives", "snowbridge-core", - "snowbridge-ethereum", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-router-primitives", @@ -18362,7 +18327,6 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18370,9 +18334,6 @@ dependencies = [ name = "snowbridge-pallet-inbound-queue-fixtures" version = "0.10.0" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", @@ -18389,7 +18350,6 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal", "pallet-message-queue", "parity-scale-codec", "scale-info", @@ -18402,14 +18362,12 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-std 14.0.0", - "staging-xcm", ] [[package]] name = "snowbridge-pallet-system" version = "0.2.0" dependencies = [ - "ethabi-decode", "frame-benchmarking", "frame-support", "frame-system", @@ -18429,7 +18387,6 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18437,22 +18394,18 @@ dependencies = [ name = "snowbridge-router-primitives" version = "0.9.0" dependencies = [ - "ethabi-decode", "frame-support", - "frame-system", "hex-literal", "log", "parity-scale-codec", "rustc-hex", "scale-info", - "serde", "snowbridge-core", "sp-core", "sp-io", "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18461,7 +18414,6 @@ name = "snowbridge-runtime-common" version = "0.2.0" dependencies = [ "frame-support", - "frame-system", "log", "parity-scale-codec", "snowbridge-core", @@ -18476,77 +18428,30 @@ dependencies = [ name = "snowbridge-runtime-test-common" version = "0.2.0" dependencies = [ - "assets-common", - "bridge-hub-test-utils", - "bridge-runtime-common", - "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", "frame-support", "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-aura", - "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-message-queue", - "pallet-multisig", "pallet-session", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", "parachains-runtimes-test-utils", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "serde", - "smallvec", - "snowbridge-beacon-primitives", "snowbridge-core", - "snowbridge-outbound-queue-runtime-api", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-ethereum-client-fixtures", - "snowbridge-pallet-inbound-queue", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", - "snowbridge-router-primitives", - "snowbridge-system-runtime-api", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", "sp-core", - "sp-genesis-builder", - "sp-inherents", "sp-io", "sp-keyring", - "sp-offchain", "sp-runtime", - "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", "staging-parachain-info", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", - "static_assertions", ] [[package]] @@ -18556,7 +18461,6 @@ dependencies = [ "parity-scale-codec", "snowbridge-core", "sp-api", - "sp-core", "sp-std 14.0.0", "staging-xcm", ] diff --git a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml index cadd542432e..0e15304ff11 100644 --- a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml +++ b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml @@ -19,10 +19,6 @@ serde = { optional = true, workspace = true, default-features = true } serde_json = { optional = true, workspace = true, default-features = true } codec = { version = "3.6.1", package = "parity-scale-codec", default-features = false, features = ["derive"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -ssz_rs = { version = "0.9.0", default-features = false } -ssz_rs_derive = { version = "0.9.0", default-features = false } -byte-slice-cast = { version = "1.2.1", default-features = false } -rlp = { version = "0.5.2", default-features = false } hex-literal = { version = "0.4.1", optional = true } log = { workspace = true } @@ -39,7 +35,6 @@ snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = f snowbridge-pallet-ethereum-client-fixtures = { path = "fixtures", default-features = false, optional = true } primitives = { package = "snowbridge-beacon-primitives", path = "../../primitives/beacon", default-features = false } static_assertions = { version = "1.1.0", default-features = false } -bp-runtime = { path = "../../../primitives/runtime", default-features = false } pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-features = false, optional = true } [dev-dependencies] @@ -62,15 +57,12 @@ fuzzing = [ "sp-io", ] std = [ - "bp-runtime/std", - "byte-slice-cast/std", "codec/std", "frame-support/std", "frame-system/std", "log/std", "pallet-timestamp/std", "primitives/std", - "rlp/std", "scale-info/std", "serde", "snowbridge-core/std", @@ -80,7 +72,6 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-std/std", - "ssz_rs/std", 'frame-benchmarking/std', ] runtime-benchmarks = [ diff --git a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml index fd1914a7d30..858e2513a96 100644 --- a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml +++ b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml @@ -18,27 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"] hex-literal = { version = "0.4.1" } sp-core = { path = "../../../../../substrate/primitives/core", default-features = false } sp-std = { path = "../../../../../substrate/primitives/std", default-features = false } -frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true } -frame-support = { path = "../../../../../substrate/frame/support", default-features = false } -frame-system = { path = "../../../../../substrate/frame/system", default-features = false } snowbridge-core = { path = "../../../primitives/core", default-features = false } snowbridge-beacon-primitives = { path = "../../../primitives/beacon", default-features = false } [features] default = ["std"] std = [ - "frame-benchmarking/std", - "frame-support/std", - "frame-system/std", "snowbridge-beacon-primitives/std", "snowbridge-core/std", "sp-core/std", "sp-std/std", ] runtime-benchmarks = [ - "frame-benchmarking", - "frame-benchmarking/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", ] diff --git a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml index 9fc1f31fbf7..71d49e684e0 100644 --- a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml @@ -22,8 +22,6 @@ hex-literal = { version = "0.4.1", optional = true } log = { workspace = true } alloy-primitives = { version = "0.4.2", default-features = false, features = ["rlp"] } alloy-sol-types = { version = "0.4.2", default-features = false } -alloy-rlp = { version = "0.3.3", default-features = false, features = ["derive"] } -num-traits = { version = "0.2.16", default-features = false } frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true } frame-support = { path = "../../../../substrate/frame/support", default-features = false } @@ -35,11 +33,9 @@ sp-io = { path = "../../../../substrate/primitives/io", default-features = false sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } -xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false } xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false } snowbridge-core = { path = "../../primitives/core", default-features = false } -snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false } snowbridge-router-primitives = { path = "../../primitives/router", default-features = false } snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-features = false } snowbridge-pallet-inbound-queue-fixtures = { path = "fixtures", default-features = false, optional = true } @@ -54,27 +50,23 @@ hex-literal = { version = "0.4.1" } default = ["std"] std = [ "alloy-primitives/std", - "alloy-rlp/std", "alloy-sol-types/std", "codec/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", - "num-traits/std", "pallet-balances/std", "scale-info/std", "serde", "snowbridge-beacon-primitives/std", "snowbridge-core/std", - "snowbridge-ethereum/std", "snowbridge-pallet-inbound-queue-fixtures?/std", "snowbridge-router-primitives/std", "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std", - "xcm-builder/std", "xcm-executor/std", "xcm/std", ] @@ -90,7 +82,6 @@ runtime-benchmarks = [ "snowbridge-pallet-inbound-queue-fixtures/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] try-runtime = [ diff --git a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml index 64605a42f0d..e84246fb5a5 100644 --- a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml +++ b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml @@ -18,27 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"] hex-literal = { version = "0.4.1" } sp-core = { path = "../../../../../substrate/primitives/core", default-features = false } sp-std = { path = "../../../../../substrate/primitives/std", default-features = false } -frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true } -frame-support = { path = "../../../../../substrate/frame/support", default-features = false } -frame-system = { path = "../../../../../substrate/frame/system", default-features = false } snowbridge-core = { path = "../../../primitives/core", default-features = false } snowbridge-beacon-primitives = { path = "../../../primitives/beacon", default-features = false } [features] default = ["std"] std = [ - "frame-benchmarking/std", - "frame-support/std", - "frame-system/std", "snowbridge-beacon-primitives/std", "snowbridge-core/std", "sp-core/std", "sp-std/std", ] runtime-benchmarks = [ - "frame-benchmarking", - "frame-benchmarking/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", ] diff --git a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml index f16a28cb1e4..387491abae0 100644 --- a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml +++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml @@ -18,7 +18,6 @@ targets = ["x86_64-unknown-linux-gnu"] serde = { features = ["alloc", "derive"], workspace = true } codec = { version = "3.6.1", package = "parity-scale-codec", default-features = false, features = ["derive"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -hex-literal = { version = "0.4.1", optional = true } frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true } frame-support = { path = "../../../../substrate/frame/support", default-features = false } @@ -35,12 +34,9 @@ snowbridge-core = { path = "../../primitives/core", default-features = false, fe snowbridge-outbound-queue-merkle-tree = { path = "merkle-tree", default-features = false } ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false } -xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } - [dev-dependencies] pallet-message-queue = { path = "../../../../substrate/frame/message-queue", default-features = false } sp-keyring = { path = "../../../../substrate/primitives/keyring" } -hex-literal = { version = "0.4.1" } [features] default = ["std"] @@ -61,7 +57,6 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-std/std", - "xcm/std", ] runtime-benchmarks = [ "bridge-hub-common/runtime-benchmarks", @@ -69,7 +64,6 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "hex-literal", "pallet-message-queue/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "sp-runtime/runtime-benchmarks", diff --git a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml index cb68fd0a250..fa49cc0f29a 100644 --- a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml +++ b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml @@ -16,11 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { version = "3.1.5", package = "parity-scale-codec", features = ["derive"], default-features = false } -sp-core = { path = "../../../../../substrate/primitives/core", default-features = false } sp-std = { path = "../../../../../substrate/primitives/std", default-features = false } sp-api = { path = "../../../../../substrate/primitives/api", default-features = false } frame-support = { path = "../../../../../substrate/frame/support", default-features = false } -xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false } snowbridge-outbound-queue-merkle-tree = { path = "../merkle-tree", default-features = false } snowbridge-core = { path = "../../../primitives/core", default-features = false } @@ -32,7 +30,5 @@ std = [ "snowbridge-core/std", "snowbridge-outbound-queue-merkle-tree/std", "sp-api/std", - "sp-core/std", "sp-std/std", - "xcm/std", ] diff --git a/bridges/snowbridge/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml index 5ad04290de0..c1ee44214c8 100644 --- a/bridges/snowbridge/pallets/system/Cargo.toml +++ b/bridges/snowbridge/pallets/system/Cargo.toml @@ -30,10 +30,8 @@ sp-io = { path = "../../../../substrate/primitives/io", default-features = false sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } -xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false } xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false } -ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false } snowbridge-core = { path = "../../primitives/core", default-features = false } [dev-dependencies] @@ -49,7 +47,6 @@ snowbridge-pallet-outbound-queue = { path = "../outbound-queue" } default = ["std"] std = [ "codec/std", - "ethabi/std", "frame-benchmarking?/std", "frame-support/std", "frame-system/std", @@ -60,7 +57,6 @@ std = [ "sp-io/std", "sp-runtime/std", "sp-std/std", - "xcm-builder/std", "xcm-executor/std", "xcm/std", ] @@ -74,7 +70,6 @@ runtime-benchmarks = [ "snowbridge-core/runtime-benchmarks", "snowbridge-pallet-outbound-queue/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] try-runtime = [ diff --git a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml index eb02ae1db52..4073dc0f71c 100644 --- a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml +++ b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml @@ -18,7 +18,6 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [ "derive", ] } -sp-core = { path = "../../../../../substrate/primitives/core", default-features = false } sp-std = { path = "../../../../../substrate/primitives/std", default-features = false } sp-api = { path = "../../../../../substrate/primitives/api", default-features = false } xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false } @@ -30,7 +29,6 @@ std = [ "codec/std", "snowbridge-core/std", "sp-api/std", - "sp-core/std", "sp-std/std", "xcm/std", ] diff --git a/bridges/snowbridge/primitives/beacon/Cargo.toml b/bridges/snowbridge/primitives/beacon/Cargo.toml index d181fa1d394..7d901bcdb04 100644 --- a/bridges/snowbridge/primitives/beacon/Cargo.toml +++ b/bridges/snowbridge/primitives/beacon/Cargo.toml @@ -19,7 +19,6 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive" rlp = { version = "0.5", default-features = false } frame-support = { path = "../../../../substrate/frame/support", default-features = false } -frame-system = { path = "../../../../substrate/frame/system", default-features = false } sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } sp-core = { path = "../../../../substrate/primitives/core", default-features = false } sp-std = { path = "../../../../substrate/primitives/std", default-features = false } @@ -30,7 +29,6 @@ ssz_rs_derive = { version = "0.9.0", default-features = false } byte-slice-cast = { version = "1.2.1", default-features = false } snowbridge-ethereum = { path = "../ethereum", default-features = false } -static_assertions = { version = "1.1.0" } milagro-bls = { package = "snowbridge-milagro-bls", version = "1.5.4", default-features = false } [dev-dependencies] @@ -42,7 +40,6 @@ std = [ "byte-slice-cast/std", "codec/std", "frame-support/std", - "frame-system/std", "hex/std", "milagro-bls/std", "rlp/std", diff --git a/bridges/snowbridge/primitives/ethereum/Cargo.toml b/bridges/snowbridge/primitives/ethereum/Cargo.toml index 9fa725a6c05..d72cd266173 100644 --- a/bridges/snowbridge/primitives/ethereum/Cargo.toml +++ b/bridges/snowbridge/primitives/ethereum/Cargo.toml @@ -18,14 +18,12 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features = scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } ethbloom = { version = "0.13.0", default-features = false } ethereum-types = { version = "0.14.1", default-features = false, features = ["codec", "rlp", "serialize"] } -hex = { package = "rustc-hex", version = "2.1.0", default-features = false } hex-literal = { version = "0.4.1", default-features = false } parity-bytes = { version = "0.1.2", default-features = false } rlp = { version = "0.5.2", default-features = false } sp-io = { path = "../../../../substrate/primitives/io", default-features = false } sp-std = { path = "../../../../substrate/primitives/std", default-features = false } -sp-core = { path = "../../../../substrate/primitives/core", default-features = false } sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false } @@ -43,13 +41,11 @@ std = [ "ethabi/std", "ethbloom/std", "ethereum-types/std", - "hex/std", "parity-bytes/std", "rlp/std", "scale-info/std", "serde", "serde-big-array", - "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std", diff --git a/bridges/snowbridge/primitives/router/Cargo.toml b/bridges/snowbridge/primitives/router/Cargo.toml index ded773e0d38..361b539af3e 100644 --- a/bridges/snowbridge/primitives/router/Cargo.toml +++ b/bridges/snowbridge/primitives/router/Cargo.toml @@ -12,26 +12,21 @@ categories = ["cryptography::cryptocurrencies"] workspace = true [dependencies] -serde = { optional = true, features = ["derive"], workspace = true, default-features = true } codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } log = { workspace = true } frame-support = { path = "../../../../substrate/frame/support", default-features = false } -frame-system = { path = "../../../../substrate/frame/system", default-features = false } sp-core = { path = "../../../../substrate/primitives/core", default-features = false } sp-io = { path = "../../../../substrate/primitives/io", default-features = false } sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } sp-std = { path = "../../../../substrate/primitives/std", default-features = false } xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } -xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false } xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false } snowbridge-core = { path = "../core", default-features = false } -ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false } - hex-literal = { version = "0.4.1" } [dev-dependencies] @@ -41,26 +36,20 @@ hex = { package = "rustc-hex", version = "2.1.0" } default = ["std"] std = [ "codec/std", - "ethabi/std", "frame-support/std", - "frame-system/std", "log/std", "scale-info/std", - "serde", "snowbridge-core/std", "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std", - "xcm-builder/std", "xcm-executor/std", "xcm/std", ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] diff --git a/bridges/snowbridge/runtime/runtime-common/Cargo.toml b/bridges/snowbridge/runtime/runtime-common/Cargo.toml index bf5e9a8832d..995475349e4 100644 --- a/bridges/snowbridge/runtime/runtime-common/Cargo.toml +++ b/bridges/snowbridge/runtime/runtime-common/Cargo.toml @@ -15,7 +15,6 @@ workspace = true log = { workspace = true } codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false } frame-support = { path = "../../../../substrate/frame/support", default-features = false } -frame-system = { path = "../../../../substrate/frame/system", default-features = false } sp-std = { path = "../../../../substrate/primitives/std", default-features = false } sp-arithmetic = { path = "../../../../substrate/primitives/arithmetic", default-features = false } xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } @@ -31,7 +30,6 @@ default = ["std"] std = [ "codec/std", "frame-support/std", - "frame-system/std", "log/std", "snowbridge-core/std", "sp-arithmetic/std", @@ -42,7 +40,6 @@ std = [ ] runtime-benchmarks = [ "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", diff --git a/bridges/snowbridge/runtime/test-common/Cargo.toml b/bridges/snowbridge/runtime/test-common/Cargo.toml index 90b4f38e721..92970339fac 100644 --- a/bridges/snowbridge/runtime/test-common/Cargo.toml +++ b/bridges/snowbridge/runtime/test-common/Cargo.toml @@ -11,191 +11,84 @@ categories = ["cryptography::cryptocurrencies"] workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -hex-literal = { version = "0.4.1" } -log = { workspace = true } -scale-info = { version = "2.11.1", default-features = false, features = ["derive"] } -serde = { optional = true, features = ["derive"], workspace = true, default-features = true } -smallvec = "1.11.0" +codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] } # Substrate -frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true } -frame-executive = { path = "../../../../substrate/frame/executive", default-features = false } frame-support = { path = "../../../../substrate/frame/support", default-features = false } frame-system = { path = "../../../../substrate/frame/system", default-features = false } -frame-system-benchmarking = { path = "../../../../substrate/frame/system/benchmarking", default-features = false, optional = true } -frame-system-rpc-runtime-api = { path = "../../../../substrate/frame/system/rpc/runtime-api", default-features = false } -frame-try-runtime = { path = "../../../../substrate/frame/try-runtime", default-features = false, optional = true } -pallet-aura = { path = "../../../../substrate/frame/aura", default-features = false } -pallet-authorship = { path = "../../../../substrate/frame/authorship", default-features = false } pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false } pallet-session = { path = "../../../../substrate/frame/session", default-features = false } -pallet-multisig = { path = "../../../../substrate/frame/multisig", default-features = false } pallet-message-queue = { path = "../../../../substrate/frame/message-queue", default-features = false } pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-features = false } -pallet-transaction-payment = { path = "../../../../substrate/frame/transaction-payment", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { path = "../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false } pallet-utility = { path = "../../../../substrate/frame/utility", default-features = false } -sp-api = { path = "../../../../substrate/primitives/api", default-features = false } -sp-block-builder = { path = "../../../../substrate/primitives/block-builder", default-features = false } -sp-consensus-aura = { path = "../../../../substrate/primitives/consensus/aura", default-features = false } sp-core = { path = "../../../../substrate/primitives/core", default-features = false } -sp-genesis-builder = { path = "../../../../substrate/primitives/genesis-builder", default-features = false } -sp-inherents = { path = "../../../../substrate/primitives/inherents", default-features = false } sp-io = { path = "../../../../substrate/primitives/io", default-features = false } sp-keyring = { path = "../../../../substrate/primitives/keyring" } -sp-offchain = { path = "../../../../substrate/primitives/offchain", default-features = false } sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false } -sp-session = { path = "../../../../substrate/primitives/session", default-features = false } -sp-std = { path = "../../../../substrate/primitives/std", default-features = false } -sp-storage = { path = "../../../../substrate/primitives/storage", default-features = false } -sp-transaction-pool = { path = "../../../../substrate/primitives/transaction-pool", default-features = false } -sp-version = { path = "../../../../substrate/primitives/version", default-features = false } # Polkadot pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false } -pallet-xcm-benchmarks = { path = "../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true } -polkadot-core-primitives = { path = "../../../../polkadot/core-primitives", default-features = false } -polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false } -polkadot-runtime-common = { path = "../../../../polkadot/runtime/common", default-features = false } xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false } -xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false } xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false } # Cumulus -cumulus-pallet-aura-ext = { path = "../../../../cumulus/pallets/aura-ext", default-features = false } cumulus-pallet-parachain-system = { path = "../../../../cumulus/pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] } -cumulus-pallet-session-benchmarking = { path = "../../../../cumulus/pallets/session-benchmarking", default-features = false } -cumulus-pallet-xcm = { path = "../../../../cumulus/pallets/xcm", default-features = false } -cumulus-pallet-xcmp-queue = { path = "../../../../cumulus/pallets/xcmp-queue", default-features = false, features = ["bridging"] } -cumulus-primitives-core = { path = "../../../../cumulus/primitives/core", default-features = false } -cumulus-primitives-utility = { path = "../../../../cumulus/primitives/utility", default-features = false } pallet-collator-selection = { path = "../../../../cumulus/pallets/collator-selection", default-features = false } parachain-info = { package = "staging-parachain-info", path = "../../../../cumulus/parachains/pallets/parachain-info", default-features = false } -parachains-common = { path = "../../../../cumulus/parachains/common", default-features = false } parachains-runtimes-test-utils = { path = "../../../../cumulus/parachains/runtimes/test-utils", default-features = false } -assets-common = { path = "../../../../cumulus/parachains/runtimes/assets/common", default-features = false } # Ethereum Bridge (Snowbridge) snowbridge-core = { path = "../../primitives/core", default-features = false } -snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-features = false } -snowbridge-router-primitives = { path = "../../primitives/router", default-features = false } snowbridge-pallet-ethereum-client = { path = "../../pallets/ethereum-client", default-features = false } snowbridge-pallet-ethereum-client-fixtures = { path = "../../pallets/ethereum-client/fixtures", default-features = false } -snowbridge-pallet-inbound-queue = { path = "../../pallets/inbound-queue", default-features = false } snowbridge-pallet-outbound-queue = { path = "../../pallets/outbound-queue", default-features = false } -snowbridge-outbound-queue-runtime-api = { path = "../../pallets/outbound-queue/runtime-api", default-features = false } snowbridge-pallet-system = { path = "../../pallets/system", default-features = false } -snowbridge-system-runtime-api = { path = "../../pallets/system/runtime-api", default-features = false } - -[dev-dependencies] -static_assertions = "1.1" -bridge-hub-test-utils = { path = "../../../../cumulus/parachains/runtimes/bridge-hubs/test-utils" } -bridge-runtime-common = { path = "../../../bin/runtime-common", features = ["integrity-test"] } -sp-keyring = { path = "../../../../substrate/primitives/keyring" } [features] default = ["std"] std = [ - "assets-common/std", "codec/std", - "cumulus-pallet-aura-ext/std", "cumulus-pallet-parachain-system/std", - "cumulus-pallet-session-benchmarking/std", - "cumulus-pallet-xcm/std", - "cumulus-pallet-xcmp-queue/std", - "cumulus-primitives-core/std", - "cumulus-primitives-utility/std", - "frame-benchmarking/std", - "frame-executive/std", "frame-support/std", - "frame-system-benchmarking?/std", - "frame-system-rpc-runtime-api/std", "frame-system/std", - "frame-try-runtime?/std", - "log/std", - "pallet-aura/std", - "pallet-authorship/std", "pallet-balances/std", "pallet-collator-selection/std", "pallet-message-queue/std", - "pallet-multisig/std", "pallet-session/std", "pallet-timestamp/std", - "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-transaction-payment/std", "pallet-utility/std", - "pallet-xcm-benchmarks?/std", "pallet-xcm/std", "parachain-info/std", - "parachains-common/std", "parachains-runtimes-test-utils/std", - "polkadot-core-primitives/std", - "polkadot-parachain-primitives/std", - "polkadot-runtime-common/std", - "scale-info/std", - "serde", - "snowbridge-beacon-primitives/std", "snowbridge-core/std", - "snowbridge-outbound-queue-runtime-api/std", "snowbridge-pallet-ethereum-client-fixtures/std", "snowbridge-pallet-ethereum-client/std", - "snowbridge-pallet-inbound-queue/std", "snowbridge-pallet-outbound-queue/std", "snowbridge-pallet-system/std", - "snowbridge-router-primitives/std", - "snowbridge-system-runtime-api/std", - "sp-api/std", - "sp-block-builder/std", - "sp-consensus-aura/std", "sp-core/std", - "sp-genesis-builder/std", - "sp-inherents/std", "sp-io/std", - "sp-offchain/std", + "sp-keyring/std", "sp-runtime/std", - "sp-session/std", - "sp-std/std", - "sp-storage/std", - "sp-transaction-pool/std", - "sp-version/std", - "xcm-builder/std", "xcm-executor/std", "xcm/std", ] runtime-benchmarks = [ - "assets-common/runtime-benchmarks", - "bridge-runtime-common/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", - "cumulus-pallet-session-benchmarking/runtime-benchmarks", - "cumulus-pallet-xcmp-queue/runtime-benchmarks", - "cumulus-primitives-core/runtime-benchmarks", - "cumulus-primitives-utility/runtime-benchmarks", - "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", - "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collator-selection/runtime-benchmarks", "pallet-message-queue/runtime-benchmarks", - "pallet-multisig/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-utility/runtime-benchmarks", - "pallet-xcm-benchmarks/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", - "parachains-common/runtime-benchmarks", - "polkadot-parachain-primitives/runtime-benchmarks", - "polkadot-runtime-common/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "snowbridge-pallet-ethereum-client-fixtures/runtime-benchmarks", "snowbridge-pallet-ethereum-client/runtime-benchmarks", - "snowbridge-pallet-inbound-queue/runtime-benchmarks", "snowbridge-pallet-outbound-queue/runtime-benchmarks", "snowbridge-pallet-system/runtime-benchmarks", - "snowbridge-router-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", ] fast-runtime = [] diff --git a/bridges/snowbridge/runtime/test-common/src/lib.rs b/bridges/snowbridge/runtime/test-common/src/lib.rs index 3e2de0e481b..8f36313e360 100644 --- a/bridges/snowbridge/runtime/test-common/src/lib.rs +++ b/bridges/snowbridge/runtime/test-common/src/lib.rs @@ -7,7 +7,6 @@ use frame_support::{ traits::{fungible::Mutate, OnFinalize, OnInitialize}, }; use frame_system::pallet_prelude::BlockNumberFor; -pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works; use parachains_runtimes_test_utils::{ AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, ValidatorIdOf, XcmReceivedFrom, }; diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml index 9b519da4b1d..c5a672234a0 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml @@ -31,8 +31,6 @@ rococo-runtime = { path = "../../../../../../../polkadot/runtime/rococo" } # Cumulus asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" } parachains-common = { path = "../../../../../common" } -cumulus-pallet-parachain-system = { path = "../../../../../../pallets/parachain-system", default-features = false } -testnet-parachains-constants = { path = "../../../../../runtimes/constants", features = ["rococo"] } asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-rococo" } penpal-runtime = { path = "../../../../../runtimes/testing/penpal" } emulated-integration-tests-common = { path = "../../../common", default-features = false } diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml index 3121ed028eb..00f4308324a 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml @@ -32,7 +32,6 @@ westend-runtime = { path = "../../../../../../../polkadot/runtime/westend" } # Cumulus parachains-common = { path = "../../../../../common" } -testnet-parachains-constants = { path = "../../../../../runtimes/constants", features = ["westend"] } penpal-runtime = { path = "../../../../../runtimes/testing/penpal" } asset-hub-westend-runtime = { path = "../../../../../runtimes/assets/asset-hub-westend" } asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" } diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml index 010c252658c..bbe54c367ba 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml @@ -31,7 +31,6 @@ xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../ # Bridges pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages", default-features = false } -bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false } # Cumulus parachains-common = { path = "../../../../../common" } @@ -48,5 +47,4 @@ snowbridge-core = { path = "../../../../../../../bridges/snowbridge/primitives/c snowbridge-router-primitives = { path = "../../../../../../../bridges/snowbridge/primitives/router", default-features = false } snowbridge-pallet-system = { path = "../../../../../../../bridges/snowbridge/pallets/system", default-features = false } snowbridge-pallet-outbound-queue = { path = "../../../../../../../bridges/snowbridge/pallets/outbound-queue", default-features = false } -snowbridge-pallet-inbound-queue = { path = "../../../../../../../bridges/snowbridge/pallets/inbound-queue", default-features = false } snowbridge-pallet-inbound-queue-fixtures = { path = "../../../../../../../bridges/snowbridge/pallets/inbound-queue/fixtures" } diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml index 9c45a7adeb4..3aa2e2bcbe0 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml @@ -28,7 +28,6 @@ xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../ # Bridges pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages", default-features = false } -bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false } # Cumulus parachains-common = { path = "../../../../../common" } -- GitLab