From d8e3f8a4ae8032d61e2b0bc283a02ee8961e22ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Wed, 16 Jun 2021 11:53:42 +0100
Subject: [PATCH] Rename `pallet-session-benchmarking` crate (#495)
This is required to support patching Substrate, as otherwise there are
two crates with the same name.
---
cumulus/Cargo.lock | 46 +++++++++----------
.../pallets/session-benchmarking/Cargo.toml | 2 +-
.../statemine-runtime/Cargo.toml | 4 +-
.../statemine-runtime/src/lib.rs | 2 +-
.../statemint-runtime/Cargo.toml | 4 +-
.../statemint-runtime/src/lib.rs | 2 +-
.../westmint-runtime/Cargo.toml | 4 +-
.../westmint-runtime/src/lib.rs | 2 +-
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 4e330ff0005..c58413d5b43 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 5d4f0b2ebc0..6136bb26740 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 a14c2b9168c..7732bf1e00c 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 5cd2c1fbf72..b3a04af5dd2 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 3a26338372d..bf9ccbbd188 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 30b772b2f1f..7745a04be5e 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 04802892717..03888589c4d 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 f08cc3c89fd..3f8ee777713 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 {}
--
GitLab