From c1f4703f4d6fcf8b74c7f4b587d3a00d6adf63a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 14 Feb 2025 10:47:10 +0100
Subject: [PATCH] frame-benchmarking: Improve macro hygiene (#7571)
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
.../parachains/runtimes/assets/asset-hub-rococo/src/lib.rs | 4 ++--
.../runtimes/assets/asset-hub-westend/src/lib.rs | 4 ++--
.../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 4 ++--
.../runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs | 4 ++--
.../runtimes/collectives/collectives-westend/src/lib.rs | 4 ++--
.../runtimes/contracts/contracts-rococo/src/lib.rs | 4 ++--
.../runtimes/coretime/coretime-rococo/src/lib.rs | 4 ++--
.../runtimes/coretime/coretime-westend/src/lib.rs | 4 ++--
.../parachains/runtimes/glutton/glutton-westend/src/lib.rs | 4 ++--
.../parachains/runtimes/people/people-rococo/src/lib.rs | 4 ++--
.../parachains/runtimes/people/people-westend/src/lib.rs | 4 ++--
cumulus/parachains/runtimes/testing/penpal/src/lib.rs | 4 ++--
polkadot/runtime/rococo/src/lib.rs | 4 ++--
polkadot/runtime/westend/src/lib.rs | 4 ++--
prdoc/pr_7571.prdoc | 7 +++++++
substrate/bin/node/runtime/src/lib.rs | 4 ++--
substrate/frame/benchmarking/src/v1.rs | 6 +++---
templates/parachain/runtime/src/apis.rs | 4 ++--
templates/solochain/runtime/src/apis.rs | 4 ++--
19 files changed, 44 insertions(+), 37 deletions(-)
create mode 100644 prdoc/pr_7571.prdoc
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 43b7bf0ba11..ba40bfd2a3a 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 6e0fa19320d..5fb6b522abf 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 fdba23a2915..c940af694b2 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 45d08ba8546..01f72fd055a 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 79c24032387..c662cd355c7 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 5ad4026e0b2..48c5859715f 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 622a40e1d8d..ccf8003639a 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 7312c9c1639..3d544aea469 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 75f45297fe2..4de0c4976ff 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 cb0282b17a6..68c51175415 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 050256dd4f6..980fb8db473 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 095ae2ed9e9..2b93e391c2e 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 15d183c301a..054ec2aa4a9 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 3aa3e26d030..cade86e5866 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 00000000000..48434a612ad
--- /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 3e11dcc674e..3cbc8aa7115 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 99aad0301c1..994b52bb9fd 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 d7da43b86af..53fa753946d 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 9dc588c43a2..536e8250056 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;
--
GitLab