paritytech · bkchr · Nov 30, 2021 · Nov 22, 2021 · Nov 22, 2021 · Nov 22, 2021
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
@@ -36,5 +36,5 @@ std = [
 	'frame-benchmarking/std',
 ]
 
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -83,7 +83,7 @@ std = [
 	"sp-version/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking",
 	"frame-system/runtime-benchmarks",

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -176,7 +176,7 @@ std = [
   "sp-io/std"
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",

diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
@@ -42,7 +42,7 @@ std = [
 	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
@@ -60,5 +60,5 @@ std = [
 	"sp-std/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/bags-list/Cargo.toml b/frame/bags-list/Cargo.toml
@@ -56,7 +56,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-core",
 	"sp-io",
 	"pallet-balances",

diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
@@ -39,5 +39,5 @@ std = [
 	"frame-system/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
@@ -44,3 +44,4 @@ std = [
 	"linregress",
 	"log/std",
 ]
+runtime-benchmarks = []
diff --git a/frame/benchmarking/src/baseline.rs b/frame/benchmarking/src/baseline.rs
@@ -18,6 +18,8 @@
 //! A set of benchmarks which can establish a global baseline for all other
 //! benchmarking.
 
+#![cfg(feature = "runtime-benchmarks")]
+
 use crate::benchmarks;
 use codec::Encode;
 use frame_system::Pallet as System;

diff --git a/frame/bounties/Cargo.toml b/frame/bounties/Cargo.toml
@@ -45,7 +45,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/collective/Cargo.toml b/frame/collective/Cargo.toml
@@ -41,7 +41,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",

@@ -79,7 +79,7 @@ std = [
 	"libsecp256k1/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"libsecp256k1",
 	"rand",
 	"rand_pcg",

diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml
@@ -44,7 +44,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",

diff --git a/frame/election-provider-multi-phase/Cargo.toml b/frame/election-provider-multi-phase/Cargo.toml
@@ -72,7 +72,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"rand",
 	"strum",

diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
@@ -47,7 +47,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/examples/basic/Cargo.toml b/frame/examples/basic/Cargo.toml
@@ -42,5 +42,5 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std"
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/gilt/Cargo.toml b/frame/gilt/Cargo.toml
@@ -40,7 +40,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/grandpa/Cargo.toml b/frame/grandpa/Cargo.toml
@@ -60,5 +60,5 @@ std = [
 	"pallet-session/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/identity/Cargo.toml b/frame/identity/Cargo.toml
@@ -40,7 +40,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/im-online/Cargo.toml b/frame/im-online/Cargo.toml
@@ -47,5 +47,5 @@ std = [
 	"frame-system/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/indices/Cargo.toml b/frame/indices/Cargo.toml
@@ -42,7 +42,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/lottery/Cargo.toml b/frame/lottery/Cargo.toml
@@ -41,7 +41,7 @@ std = [
 	"frame-system/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]

diff --git a/frame/membership/Cargo.toml b/frame/membership/Cargo.toml
@@ -41,7 +41,7 @@ std = [
 	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",

@@ -46,5 +46,5 @@ std = [
 	"frame-system/std",
 	"pallet-mmr-primitives/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/multisig/Cargo.toml b/frame/multisig/Cargo.toml
@@ -39,7 +39,7 @@ std = [
 	"sp-std/std"
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/proxy/Cargo.toml b/frame/proxy/Cargo.toml
@@ -40,7 +40,7 @@ std = [
 	"sp-io/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/scheduler/Cargo.toml b/frame/scheduler/Cargo.toml
@@ -39,7 +39,7 @@ std = [
 	"log/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
@@ -68,7 +68,7 @@ std = [
 	"frame-election-provider-support/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"rand_chacha",
 ]

diff --git a/frame/timestamp/Cargo.toml b/frame/timestamp/Cargo.toml
@@ -45,5 +45,5 @@ std = [
 	"sp-timestamp/std",
 	"log/std",
 ]
-runtime-benchmarks = ["frame-benchmarking", "sp-io"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks", "sp-io"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/tips/Cargo.toml b/frame/tips/Cargo.toml
@@ -50,7 +50,7 @@ std = [
 	"pallet-treasury/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/transaction-storage/Cargo.toml b/frame/transaction-storage/Cargo.toml
@@ -33,7 +33,7 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-featu
 
 [features]
 default = ["std"]
-runtime-benchmarks = ["frame-benchmarking", "hex-literal"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks", "hex-literal"]
 std = [
 	"serde",
 	"codec/std",

diff --git a/frame/treasury/Cargo.toml b/frame/treasury/Cargo.toml
@@ -47,7 +47,7 @@ std = [
 	"pallet-balances/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/uniques/Cargo.toml b/frame/uniques/Cargo.toml
@@ -39,7 +39,7 @@ std = [
 	"frame-benchmarking/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/utility/Cargo.toml b/frame/utility/Cargo.toml
@@ -40,7 +40,7 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]

diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
@@ -39,5 +39,5 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 ]
-runtime-benchmarks = ["frame-benchmarking"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]