fix runtime-benchmark feature build

tangle-network · Dec 27, 2023 · aaf913b · aaf913b
1 parent 34fc003
commit aaf913b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -124,7 +124,12 @@ tangle-crypto-primitives = { workspace = true }
 
 [features]
 default = ["with-rocksdb-weights", "rocksdb", "sql"]
-runtime-benchmarks = ["tangle-testnet-runtime/runtime-benchmarks"]
+runtime-benchmarks = [
+    "tangle-testnet-runtime/runtime-benchmarks",
+    "frame-benchmarking/runtime-benchmarks",
+    "frame-benchmarking-cli/runtime-benchmarks",
+    "sc-service/runtime-benchmarks",
+    ]
 with-rocksdb-weights = ["tangle-testnet-runtime/with-rocksdb-weights"]
 with-paritydb-weights = ["tangle-testnet-runtime/with-paritydb-weights"]
 rocksdb = [

diff --git a/runtime/mainnet/Cargo.toml b/runtime/mainnet/Cargo.toml
@@ -134,6 +134,7 @@ runtime-benchmarks = [
   "frame-system-benchmarking",
   "frame-support/runtime-benchmarks",
   "frame-system/runtime-benchmarks",
+  "frame-system-benchmarking/runtime-benchmarks",
   "pallet-balances/runtime-benchmarks",
   "pallet-vesting/runtime-benchmarks",
   "pallet-collective/runtime-benchmarks",
@@ -168,6 +169,7 @@ std = [
   "frame-executive/std",
   "frame-system/std",
   "frame-system-rpc-runtime-api/std",
+  "frame-system-benchmarking?/std",
   "frame-election-provider-support/std",
   "pallet-authorship/std",
   "pallet-babe/std",

diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs
@@ -1758,11 +1758,10 @@ impl_runtime_apis! {
 			Vec<frame_benchmarking::BenchmarkList>,
 			Vec<frame_support::traits::StorageInfo>,
 		) {
-			use frame_benchmarking::{list_benchmark, baseline, Benchmarking, BenchmarkList};
+			use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};
 			use frame_support::traits::StorageInfoTrait;
 
 			use frame_system_benchmarking::Pallet as SystemBench;
-			use baseline::Pallet as BaselineBench;
 
 			let mut list = Vec::<BenchmarkList>::new();
 
@@ -1778,8 +1777,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
-
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark };
+			use frame_support::traits::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			impl frame_system_benchmarking::Config for Runtime {}
 

diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml
@@ -137,6 +137,7 @@ runtime-benchmarks = [
   "frame-system-benchmarking",
   "frame-support/runtime-benchmarks",
   "frame-system/runtime-benchmarks",
+  "frame-system-benchmarking/runtime-benchmarks",
   "pallet-balances/runtime-benchmarks",
   "pallet-vesting/runtime-benchmarks",
   "pallet-collective/runtime-benchmarks",
@@ -171,6 +172,7 @@ std = [
   "frame-executive/std",
   "frame-system/std",
   "frame-system-rpc-runtime-api/std",
+  "frame-system-benchmarking?/std",
   "frame-election-provider-support/std",
   "pallet-authorship/std",
   "pallet-babe/std",

diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
@@ -1876,11 +1876,10 @@ impl_runtime_apis! {
 			Vec<frame_benchmarking::BenchmarkList>,
 			Vec<frame_support::traits::StorageInfo>,
 		) {
-			use frame_benchmarking::{list_benchmark, baseline, Benchmarking, BenchmarkList};
+			use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};
 			use frame_support::traits::StorageInfoTrait;
 
 			use frame_system_benchmarking::Pallet as SystemBench;
-			use baseline::Pallet as BaselineBench;
 
 			let mut list = Vec::<BenchmarkList>::new();
 
@@ -1896,8 +1895,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
-
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark};
+			use frame_support::traits::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			impl frame_system_benchmarking::Config for Runtime {}