diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs index 43b7bf0ba1184e095c2f53eeefceb2b88b154a9a..ba40bfd2a3abd979b67a73d9ecbab02eea852b88 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs @@ -1648,7 +1648,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -1682,7 +1682,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 6e0fa19320dd2481c566734873ecc5a9c8fcc54f..5fb6b522abf1b9a62daab583ed3f6445ce094f11 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -1844,7 +1844,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -1878,7 +1878,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index fdba23a2915f421f608e5d10711f2c885a1a9019..c940af694b220ad31ad198cd59ee650291b55dd9 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -1052,7 +1052,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -1084,7 +1084,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs index 45d08ba8546cded82756786f564d9f888dbd4562..01f72fd055a257ae52426bc7ab375fc646a1db8f 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs @@ -945,7 +945,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -974,7 +974,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs index 79c240323878b15b41ea70fc9b9fc24951d4fda5..c662cd355c73b68740837dd59042dd849be5982c 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs @@ -1063,7 +1063,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -1086,7 +1086,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index 5ad4026e0b2b4cba04460d285253da42b14b077d..48c5859715f4bbf7079ec55547dca6b67be67f22 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -766,7 +766,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -783,7 +783,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs index 622a40e1d8dc09c9f9f31f0fd80f136b724763b2..ccf8003639acddbe78d945a11fef7e086d4f4d92 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs @@ -929,7 +929,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; @@ -951,7 +951,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs index 7312c9c1639d29a69b11ee520e0b21d6289f815a..3d544aea469f3844a58db2bf0857f8945cb6351e 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs @@ -921,7 +921,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; @@ -943,7 +943,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs index 75f45297fe2cdade064fe3478ff1979aecb11ee2..4de0c4976ffda93d185da76b40c7f68bf114bb00 100644 --- a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs @@ -446,7 +446,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -462,7 +462,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs index cb0282b17a6ce54bfbd13061d71c14ae284cf301..68c51175415c507b3449314713c9324c83709d4e 100644 --- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs @@ -877,7 +877,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; @@ -899,7 +899,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs index 050256dd4f6a38a2908c16c57c9a0d3ee255bdaa..980fb8db473204cd1a41adc55310f59b5dc1529a 100644 --- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs @@ -875,7 +875,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; @@ -897,7 +897,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs index 095ae2ed9e962cdeaa7515d0708e13a1e9583e62..2b93e391c2e8f760961664560c372d57e0d3c848 100644 --- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs +++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs @@ -1119,7 +1119,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -1135,7 +1135,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch}; + use frame_benchmarking::BenchmarkBatch; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index 15d183c301a87464bb183ac9c3f0f4261e66aeee..054ec2aa4a931ff89d29d1f21112eb38f22edd61 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -2447,7 +2447,7 @@ sp_api::impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; @@ -2470,7 +2470,7 @@ sp_api::impl_runtime_apis! { alloc::string::String, > { use frame_support::traits::WhitelistedStorageKeys; - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; use frame_benchmarking::baseline::Pallet as Baseline; diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index 3aa3e26d030e61bb41212ce2f28ac72467a1cac6..cade86e5866904efe7e260e6e4b6e735d615ee66 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -2611,7 +2611,7 @@ sp_api::impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use frame_support::traits::StorageInfoTrait; use pallet_session_benchmarking::Pallet as SessionBench; @@ -2639,7 +2639,7 @@ sp_api::impl_runtime_apis! { alloc::string::String, > { use frame_support::traits::WhitelistedStorageKeys; - use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError}; + use frame_benchmarking::{BenchmarkBatch, BenchmarkError}; use sp_storage::TrackedStorageKey; // Trying to add benchmarks directly to some pallets caused cyclic dependency issues. // To get around that, we separated the benchmarks into its own crate. diff --git a/prdoc/pr_7571.prdoc b/prdoc/pr_7571.prdoc new file mode 100644 index 0000000000000000000000000000000000000000..48434a612adf1352a187ca9599092ae55c693a25 --- /dev/null +++ b/prdoc/pr_7571.prdoc @@ -0,0 +1,7 @@ +title: 'frame-benchmarking: Improve macro hygiene' +doc: +- audience: Runtime Dev + description: Improve macro hygiene of benchmarking macros. +crates: +- name: frame-benchmarking + bump: patch diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs index 3e11dcc674ec7851f338a4e4cb97b407fb9812c1..3cbc8aa7115d60ae33f3c36e62834c522ac86ac0 100644 --- a/substrate/bin/node/runtime/src/lib.rs +++ b/substrate/bin/node/runtime/src/lib.rs @@ -3756,7 +3756,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkList}; + use frame_benchmarking::{baseline, BenchmarkList}; use frame_support::traits::StorageInfoTrait; // Trying to add benchmarks directly to the Session Pallet caused cyclic dependency @@ -3781,7 +3781,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch}; + use frame_benchmarking::{baseline, BenchmarkBatch}; use sp_storage::TrackedStorageKey; // Trying to add benchmarks directly to the Session Pallet caused cyclic dependency diff --git a/substrate/frame/benchmarking/src/v1.rs b/substrate/frame/benchmarking/src/v1.rs index 99aad0301c12760c8c75881b7c2f2dac84c0767d..994b52bb9fd07031a0bc7305d16005dc6dfa8512 100644 --- a/substrate/frame/benchmarking/src/v1.rs +++ b/substrate/frame/benchmarking/src/v1.rs @@ -1828,7 +1828,7 @@ macro_rules! add_benchmark { internal_repeats, } = config; if &pallet[..] == &name_string[..] && &instance[..] == &instance_string[..] { - let benchmark_result = <$location>::run_benchmark( + let benchmark_result = <$location as $crate::Benchmarking>::run_benchmark( &benchmark[..], &selected_components[..], whitelist, @@ -1915,8 +1915,8 @@ macro_rules! list_benchmark { ( $list:ident, $extra:ident, $name:path, $location:ty ) => { let pallet_string = stringify!($name).as_bytes(); let instance_string = stringify!($location).as_bytes(); - let benchmarks = <$location>::benchmarks($extra); - let pallet_benchmarks = BenchmarkList { + let benchmarks = <$location as $crate::Benchmarking>::benchmarks($extra); + let pallet_benchmarks = $crate::BenchmarkList { pallet: pallet_string.to_vec(), instance: instance_string.to_vec(), benchmarks: benchmarks.to_vec(), diff --git a/templates/parachain/runtime/src/apis.rs b/templates/parachain/runtime/src/apis.rs index d7da43b86af166e991371acb78806c46072cdfc0..53fa753946d845e98b05029b2f9ec8e5bfec25d3 100644 --- a/templates/parachain/runtime/src/apis.rs +++ b/templates/parachain/runtime/src/apis.rs @@ -252,7 +252,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<polkadot_sdk::frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{Benchmarking, BenchmarkList}; + use frame_benchmarking::BenchmarkList; use polkadot_sdk::frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use cumulus_pallet_session_benchmarking::Pallet as SessionBench; @@ -268,7 +268,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch}; + use frame_benchmarking::{BenchmarkError, BenchmarkBatch}; use super::*; use frame_system_benchmarking::Pallet as SystemBench; diff --git a/templates/solochain/runtime/src/apis.rs b/templates/solochain/runtime/src/apis.rs index 9dc588c43a2d5eaaa823802972a735dab40d49b0..536e8250056d3d2379ac28de8340142195f46292 100644 --- a/templates/solochain/runtime/src/apis.rs +++ b/templates/solochain/runtime/src/apis.rs @@ -226,7 +226,7 @@ impl_runtime_apis! { Vec<frame_benchmarking::BenchmarkList>, Vec<frame_support::traits::StorageInfo>, ) { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkList}; + use frame_benchmarking::{baseline, BenchmarkList}; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench; @@ -244,7 +244,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch}; + use frame_benchmarking::{baseline, BenchmarkBatch}; use sp_storage::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;