Companion for #10324 - update frame-benchmarking/runtime-benchmarks (#4387)

zjb0807 · bkchr · drahnr · commit 7991e2c458be · 2021-12-01T14:20:40.000+01:00
* update frame-benchmarking/runtime-benchmarks

* Update Substrate

Co-authored-by: Bastian Köcher &lt;info@kchr.de&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml
@@ -121,7 +121,7 @@ std = [
 ]
 runtime-benchmarks = [
 	"bridge-runtime-common/runtime-benchmarks",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"libsecp256k1",
diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml
@@ -43,6 +43,6 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-std",
 ]
diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml
@@ -44,6 +44,6 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"libsecp256k1",
 ]
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
@@ -57,5 +57,5 @@ std = [
 ]
 runtime-benchmarks = [
 	"bp-test-utils",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 ]
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
@@ -55,5 +55,5 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 ]
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -102,7 +102,7 @@ std = [
 runtime-benchmarks = [
 	"libsecp256k1/hmac",
 	"libsecp256k1/static-context",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
@@ -179,7 +179,7 @@ std = [
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml
@@ -83,7 +83,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"primitives/runtime-benchmarks",
@@ -96,4 +96,4 @@ try-runtime = [
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-vesting/try-runtime",
-]
+]
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
@@ -170,7 +170,7 @@ std = [
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
@@ -176,7 +176,7 @@ runtime-benchmarks = [
 	"pallet-xcm/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"hex-literal",
 	"runtime-parachains/runtime-benchmarks",
 ]
diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml
@@ -174,7 +174,7 @@ std = [
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml
@@ -21,7 +21,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
 [features]
 default = ["std"]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 ]
 std = [
 	"parity-scale-codec/std",

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ std = [`
`121`	`121`	`]`
`122`	`122`	`runtime-benchmarks = [`
`123`	`123`	`"bridge-runtime-common/runtime-benchmarks",`
`124`		`- "frame-benchmarking",`
	`124`	`+ "frame-benchmarking/runtime-benchmarks",`
`125`	`125`	`"frame-support/runtime-benchmarks",`
`126`	`126`	`"frame-system/runtime-benchmarks",`
`127`	`127`	`"libsecp256k1",`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ std = [`
`43`	`43`	`"sp-std/std",`
`44`	`44`	`]`
`45`	`45`	`runtime-benchmarks = [`
`46`		`- "frame-benchmarking",`
	`46`	`+ "frame-benchmarking/runtime-benchmarks",`
`47`	`47`	`"sp-std",`
`48`	`48`	`]`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ std = [`
`44`	`44`	`"sp-std/std",`
`45`	`45`	`]`
`46`	`46`	`runtime-benchmarks = [`
`47`		`- "frame-benchmarking",`
	`47`	`+ "frame-benchmarking/runtime-benchmarks",`
`48`	`48`	`"libsecp256k1",`
`49`	`49`	`]`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ std = [`
`57`	`57`	`]`
`58`	`58`	`runtime-benchmarks = [`
`59`	`59`	`"bp-test-utils",`
`60`		`- "frame-benchmarking",`
	`60`	`+ "frame-benchmarking/runtime-benchmarks",`
`61`	`61`	`]`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ std = [`
`55`	`55`	`"sp-std/std",`
`56`	`56`	`]`
`57`	`57`	`runtime-benchmarks = [`
`58`		`- "frame-benchmarking",`
	`58`	`+ "frame-benchmarking/runtime-benchmarks",`
`59`	`59`	`]`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ std = [`
`179`	`179`	`]`
`180`	`180`	`runtime-benchmarks = [`
`181`	`181`	`"runtime-common/runtime-benchmarks",`
`182`		`- "frame-benchmarking",`
	`182`	`+ "frame-benchmarking/runtime-benchmarks",`
`183`	`183`	`"frame-support/runtime-benchmarks",`
`184`	`184`	`"frame-system/runtime-benchmarks",`
`185`	`185`	`"sp-runtime/runtime-benchmarks",`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ std = [`
`170`	`170`	`]`
`171`	`171`	`runtime-benchmarks = [`
`172`	`172`	`"runtime-common/runtime-benchmarks",`
`173`		`- "frame-benchmarking",`
	`173`	`+ "frame-benchmarking/runtime-benchmarks",`
`174`	`174`	`"frame-support/runtime-benchmarks",`
`175`	`175`	`"frame-system/runtime-benchmarks",`
`176`	`176`	`"sp-runtime/runtime-benchmarks",`