diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index 4e330ff0005f6cf015513994503810a961a14a2a..c58413d5b43cfec8523f1981307615a0fa24e758 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -1692,6 +1692,23 @@ dependencies = [ "syn 1.0.73", ] +[[package]] +name = "cumulus-pallet-session-benchmarking" +version = "3.0.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", +] + [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" @@ -3942,7 +3959,7 @@ dependencies = [ "pallet-recovery", "pallet-scheduler", "pallet-session", - "pallet-session-benchmarking 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-fn", @@ -5743,23 +5760,6 @@ dependencies = [ "sp-trie", ] -[[package]] -name = "pallet-session-benchmarking" -version = "3.0.0" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-session", - "parity-scale-codec", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", -] - [[package]] name = "pallet-session-benchmarking" version = "3.0.0" @@ -7226,7 +7226,7 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-scheduler", "pallet-session", - "pallet-session-benchmarking 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", @@ -10753,6 +10753,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", @@ -10779,7 +10780,6 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-session", - "pallet-session-benchmarking 3.0.0", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -10842,6 +10842,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", @@ -10868,7 +10869,6 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-session", - "pallet-session-benchmarking 3.0.0", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -12545,7 +12545,7 @@ dependencies = [ "pallet-recovery", "pallet-scheduler", "pallet-session", - "pallet-session-benchmarking 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", + "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", @@ -12595,6 +12595,7 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", @@ -12621,7 +12622,6 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-session", - "pallet-session-benchmarking 3.0.0", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", diff --git a/cumulus/pallets/session-benchmarking/Cargo.toml b/cumulus/pallets/session-benchmarking/Cargo.toml index 5d4f0b2ebc04b448f1c9805beca5d8929f34b027..6136bb267406e8b1e79729ae6c89d0f6a6928542 100644 --- a/cumulus/pallets/session-benchmarking/Cargo.toml +++ b/cumulus/pallets/session-benchmarking/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pallet-session-benchmarking" +name = "cumulus-pallet-session-benchmarking" version = "3.0.0" authors = ["Parity Technologies <admin@parity.io>"] edition = "2018" diff --git a/cumulus/polkadot-parachains/statemine-runtime/Cargo.toml b/cumulus/polkadot-parachains/statemine-runtime/Cargo.toml index a14c2b9168cb8bd5a923203502e396b765655cb6..7732bf1e00ccfd2f7b1d51f05fca3a170dfd884b 100644 --- a/cumulus/polkadot-parachains/statemine-runtime/Cargo.toml +++ b/cumulus/polkadot-parachains/statemine-runtime/Cargo.toml @@ -41,7 +41,6 @@ pallet-multisig = { git = "https://github.com/paritytech/substrate", default-fea pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -61,6 +60,7 @@ cumulus-primitives-utility = { path = "../../primitives/utility", default-featur cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } +cumulus-pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} cumulus-ping = { path = "../pallets/ping", default-features = false } pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } statemint-common = { path = "../statemint-common", default-features = false } @@ -94,7 +94,7 @@ runtime-benchmarks = [ 'pallet-balances/runtime-benchmarks', 'pallet-multisig/runtime-benchmarks', 'pallet-proxy/runtime-benchmarks', - 'pallet-session-benchmarking/runtime-benchmarks', + 'cumulus-pallet-session-benchmarking/runtime-benchmarks', 'pallet-uniques/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', diff --git a/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs b/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs index 5cd2c1fbf7225fddb19c8160ce51de3d033f6f03..b3a04af5dd2ebcc66adc9ff39b556f90622f42a5 100644 --- a/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs +++ b/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs @@ -861,7 +861,7 @@ impl_runtime_apis! { ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; - use pallet_session_benchmarking::Pallet as SessionBench; + use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_system_benchmarking::Pallet as SystemBench; impl frame_system_benchmarking::Config for Runtime {} diff --git a/cumulus/polkadot-parachains/statemint-runtime/Cargo.toml b/cumulus/polkadot-parachains/statemint-runtime/Cargo.toml index 3a26338372d91733baf3bfcf2d378f2bc5f25493..bf9ccbbd188d2f31c7a3f45b32074fed1a00621f 100644 --- a/cumulus/polkadot-parachains/statemint-runtime/Cargo.toml +++ b/cumulus/polkadot-parachains/statemint-runtime/Cargo.toml @@ -41,7 +41,6 @@ pallet-multisig = { git = "https://github.com/paritytech/substrate", default-fea pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -60,6 +59,7 @@ cumulus-primitives-utility = { path = "../../primitives/utility", default-featur cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } +cumulus-pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0" } cumulus-ping = { path = "../pallets/ping", default-features = false } pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } statemint-common = { path = "../statemint-common", default-features = false } @@ -93,7 +93,7 @@ runtime-benchmarks = [ 'pallet-balances/runtime-benchmarks', 'pallet-multisig/runtime-benchmarks', 'pallet-proxy/runtime-benchmarks', - 'pallet-session-benchmarking/runtime-benchmarks', + 'cumulus-pallet-session-benchmarking/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', diff --git a/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs b/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs index 30b772b2f1f4be66d37c592135ab55ef811caac3..7745a04be5e150deca5f2e69412cdf537ff48186 100644 --- a/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs +++ b/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs @@ -790,7 +790,7 @@ impl_runtime_apis! { ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; - use pallet_session_benchmarking::Pallet as SessionBench; + use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_system_benchmarking::Pallet as SystemBench; impl frame_system_benchmarking::Config for Runtime {} impl pallet_session_benchmarking::Config for Runtime {} diff --git a/cumulus/polkadot-parachains/westmint-runtime/Cargo.toml b/cumulus/polkadot-parachains/westmint-runtime/Cargo.toml index 048028927178adb1d03da6e1e174687cb2fc1975..03888589c4d344151d5aaa80e3882f88c60bc574 100644 --- a/cumulus/polkadot-parachains/westmint-runtime/Cargo.toml +++ b/cumulus/polkadot-parachains/westmint-runtime/Cargo.toml @@ -41,7 +41,6 @@ pallet-multisig = { git = "https://github.com/paritytech/substrate", default-fea pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -60,6 +59,7 @@ cumulus-primitives-utility = { path = "../../primitives/utility", default-featur cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false } cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false } +cumulus-pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"} cumulus-ping = { path = "../pallets/ping", default-features = false } pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } statemint-common = { path = "../statemint-common", default-features = false } @@ -93,7 +93,7 @@ runtime-benchmarks = [ 'pallet-balances/runtime-benchmarks', 'pallet-multisig/runtime-benchmarks', 'pallet-proxy/runtime-benchmarks', - 'pallet-session-benchmarking/runtime-benchmarks', + 'cumulus-pallet-session-benchmarking/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', diff --git a/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs b/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs index f08cc3c89fd10cd18f5b323e885bc07eb590f49b..3f8ee777713b354fae04ef80fe1e5cdecab40d1f 100644 --- a/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs +++ b/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs @@ -788,7 +788,7 @@ impl_runtime_apis! { ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; - use pallet_session_benchmarking::Pallet as SessionBench; + use cumulus_pallet_session_benchmarking::Pallet as SessionBench; use frame_system_benchmarking::Pallet as SystemBench; impl frame_system_benchmarking::Config for Runtime {}