Migrate pallet-benchmarking and pallet-benchmarking-pov to use umbrella crate

substrate/frame/Cargo.toml

@@ -48,6 +48,8 @@ sp-session = { optional = true, workspace = true }
 sp-storage = { optional = true, workspace = true }
 sp-transaction-pool = { optional = true, workspace = true }
 sp-version = { optional = true, workspace = true }
+sp-application-crypto = { optional = true, workspace = true }
+
 
 frame-executive = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { optional = true, workspace = true }
@@ -83,6 +85,7 @@ runtime = [
 	"sp-storage",
 	"sp-transaction-pool",
 	"sp-version",
+	"sp-application-crypto",
 ]
 std = [
 	"codec/std",
@@ -111,6 +114,7 @@ std = [
 	"sp-storage/std",
 	"sp-transaction-pool?/std",
 	"sp-version?/std",
+	"sp-application-crypto/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

substrate/frame/benchmarking/Cargo.toml

@@ -17,21 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame-support = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"]}
+# frame-support = { workspace = true }
 frame-support-procedural = { workspace = true }
-frame-system = { workspace = true }
+# frame-system = { workspace = true }
 linregress = { optional = true, workspace = true }
 log = { workspace = true }
 paste = { workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
-sp-api = { workspace = true }
-sp-application-crypto = { workspace = true }
-sp-core = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 sp-runtime-interface = { workspace = true }
-sp-storage = { workspace = true }
 static_assertions = { workspace = true, default-features = true }
 
 [dev-dependencies]
@@ -46,27 +41,17 @@ sp-state-machine = { workspace = true }
 default = ["std"]
 std = [
 	"codec/std",
+	"frame/std",
 	"frame-support-procedural/std",
-	"frame-support/std",
-	"frame-system/std",
 	"linregress",
 	"log/std",
 	"scale-info/std",
 	"serde",
-	"sp-api/std",
-	"sp-application-crypto/std",
-	"sp-core/std",
 	"sp-externalities/std",
-	"sp-io/std",
 	"sp-keystore/std",
 	"sp-runtime-interface/std",
-	"sp-runtime/std",
 	"sp-state-machine/std",
-	"sp-storage/std",
 ]
 runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"sc-client-db/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]

substrate/frame/benchmarking/pov/Cargo.toml

@@ -17,31 +17,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true }
 frame-benchmarking = { workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"]}
 scale-info = { features = ["derive"], workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
 	"scale-info/std",
-	"sp-io/std",
-	"sp-runtime/std",
+	"frame/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
+	"frame/try-runtime",
 ]

substrate/frame/benchmarking/pov/src/benchmarking.rs

@@ -21,13 +21,10 @@
 
 use super::*;
 
-use frame_benchmarking::v2::*;
-use frame_support::traits::UnfilteredDispatchable;
-use frame_system::{Pallet as System, RawOrigin};
-use sp_runtime::traits::Hash;
+use frame::benchmarking::prelude::*;
 
 #[cfg(feature = "std")]
-frame_support::parameter_types! {
+parameter_types! {
 	pub static StorageRootHash: Option<alloc::vec::Vec<u8>> = None;
 }
 
@@ -113,7 +110,7 @@ mod benchmarks {
 		// Assume there are 16-256 other storage items.
 		(0..(1u32 << 4)).for_each(|i| {
 			let k = T::Hashing::hash(&i.to_be_bytes());
-			frame_support::storage::unhashed::put(k.as_ref(), &i);
+			unhashed::put(k.as_ref(), &i);
 		});
 
 		#[block]
@@ -128,7 +125,7 @@ mod benchmarks {
 		// Assume there are 256-4096 other storage items.
 		(0..(1u32 << 8)).for_each(|i| {
 			let k = T::Hashing::hash(&i.to_be_bytes());
-			frame_support::storage::unhashed::put(k.as_ref(), &i);
+			unhashed::put(k.as_ref(), &i);
 		});
 
 		#[block]
@@ -143,7 +140,7 @@ mod benchmarks {
 		// Assume there are 4096-65536 other storage items.
 		(0..(1u32 << 12)).for_each(|i| {
 			let k = T::Hashing::hash(&i.to_be_bytes());
-			frame_support::storage::unhashed::put(k.as_ref(), &i);
+			unhashed::put(k.as_ref(), &i);
 		});
 
 		#[block]

substrate/frame/benchmarking/pov/src/lib.rs

@@ -24,14 +24,13 @@ mod tests;
 mod weights;
 
 extern crate alloc;
+use frame::prelude::*;
 
 pub use pallet::*;
 
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	use alloc::vec::Vec;
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);

substrate/frame/benchmarking/pov/src/tests.rs

@@ -20,6 +20,8 @@
 #![cfg(test)]
 
 use super::weights::WeightInfo;
+use frame::testing_prelude::*;
+
 use mock::Test as T;
 type W = crate::weights::SubstrateWeight<T>;
 
@@ -162,12 +164,11 @@ fn noop_is_free() {
 }
 
 mod mock {
-	use frame_support::derive_impl;
-	use sp_runtime::testing::H256;
+	// use sp_runtime::testing::H256;
 
-	type Block = frame_system::mocking::MockBlock<Test>;
+	type Block = MockBlock<Test>;
 
-	frame_support::construct_runtime!(
+	construct_runtime!(
 		pub enum Test
 		{
 			System: frame_system,

substrate/frame/benchmarking/src/baseline.rs

@@ -22,14 +22,10 @@
 
 use crate::benchmarks;
 use alloc::{vec, vec::Vec};
-use frame_system::Pallet as System;
-use sp_runtime::{
-	traits::{AppVerify, Hash},
-	RuntimeAppPublic,
-};
+use frame::testing_prelude::*;
 
 mod crypto {
-	use sp_application_crypto::{app_crypto, sr25519, KeyTypeId};
+	use frame::deps::sp_application_crypto::{app_crypto, sr25519, KeyTypeId};
 
 	pub const TEST_KEY_TYPE_ID: KeyTypeId = KeyTypeId(*b"test");
 	app_crypto!(sr25519, TEST_KEY_TYPE_ID);
@@ -110,15 +106,14 @@ benchmarks! {
 
 #[cfg(test)]
 pub mod mock {
-	use frame_support::derive_impl;
 	use sp_runtime::{testing::H256, BuildStorage};
 
 	type AccountId = u64;
 	type Nonce = u32;
 
-	type Block = frame_system::mocking::MockBlock<Test>;
+	type Block = MockBlock<Test>;
 
-	frame_support::construct_runtime!(
+	construct_runtime!(
 		pub enum Test
 		{
 			System: frame_system,
@@ -149,12 +144,12 @@ pub mod mock {
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
 		type OnSetCode = ();
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
+		type MaxConsumers = ConstU32<16>;
 	}
 
 	impl super::Config for Test {}
 
-	pub fn new_test_ext() -> sp_io::TestExternalities {
+	pub fn new_test_ext() -> TestState {
 		use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 
 		let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();

substrate/frame/benchmarking/src/lib.rs

@@ -39,13 +39,10 @@ pub mod v1;
 pub mod __private {
 	pub use alloc::{boxed::Box, str, vec, vec::Vec};
 	pub use codec;
-	pub use frame_support::{storage, traits};
+	pub use frame::deps::{sp_core::defer, sp_io::storage::root as storage_root};
 	pub use log;
 	pub use paste;
-	pub use sp_core::defer;
-	pub use sp_io::storage::root as storage_root;
-	pub use sp_runtime::{traits::Zero, StateVersion};
-	pub use sp_storage::{well_known_keys, TrackedStorageKey};
+	pub use frame::deps::sp_storage::{well_known_keys, TrackedStorageKey};
 }
 
 #[cfg(feature = "std")]
@@ -72,7 +69,7 @@ pub use v1::*;
 /// #![cfg(feature = "runtime-benchmarks")]
 ///
 /// use super::{mock_helpers::*, Pallet as MyPallet};
-/// use frame_benchmarking::v2::*;
+/// use frame::benchmarking::prelude::*;
 ///
 /// #[benchmarks]
 /// mod benchmarks {
@@ -283,7 +280,7 @@ pub use v1::*;
 /// #![cfg(feature = "runtime-benchmarks")]
 ///
 /// use super::{mock_helpers::*, Pallet as MyPallet};
-/// use frame_benchmarking::v2::*;
+/// use frame::benchmarking::prelude::*;
 ///
 /// #[benchmarks]
 /// mod benchmarks {
@@ -344,7 +341,7 @@ pub use v1::*;
 /// ```ignore
 /// #![cfg(feature = "runtime-benchmarks")]
 ///
-/// use frame_benchmarking::v1::*;
+/// use frame::benchmarking::prelude::*;
 ///
 /// benchmarks! {
 ///

substrate/frame/benchmarking/src/tests.rs

@@ -19,18 +19,11 @@
 
 #![cfg(test)]
 
-use frame_support::{derive_impl, parameter_types, traits::ConstU32};
-use sp_runtime::{
-	testing::H256,
-	traits::{BlakeTwo256, IdentityLookup},
-	BuildStorage,
-};
+use frame::testing_prelude::*;
 use std::cell::RefCell;
 
-#[frame_support::pallet(dev_mode)]
+#[frame::pallet(dev_mode)]
 mod pallet_test {
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -64,9 +57,9 @@ mod pallet_test {
 	}
 }
 
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = MockBlock<Test>;
 
-frame_support::construct_runtime!(
+construct_runtime!(
 	pub enum Test
 	{
 		System: frame_system,
@@ -111,7 +104,7 @@ impl pallet_test::Config for Test {
 	type MaybeItem = MaybeItem;
 }
 
-fn new_test_ext() -> sp_io::TestExternalities {
+fn new_test_ext() -> TestState {
 	RuntimeGenesisConfig::default().build_storage().unwrap().into()
 }
 
@@ -126,8 +119,6 @@ thread_local! {
 mod benchmarks {
 	use super::{new_test_ext, pallet_test::Value, Test, VALUES_PER_COMPONENT};
 	use crate::{account, BenchmarkError, BenchmarkParameter, BenchmarkResult, BenchmarkingSetup};
-	use frame_support::{assert_err, assert_ok, ensure, traits::Get};
-	use frame_system::RawOrigin;
 	use rusty_fork::rusty_fork_test;
 
 	// Additional used internally by the benchmark macro.

substrate/frame/benchmarking/src/tests_instance.rs

@@ -19,17 +19,10 @@
 
 #![cfg(test)]
 
-use frame_support::{derive_impl, traits::ConstU32};
-use sp_runtime::{
-	testing::H256,
-	traits::{BlakeTwo256, IdentityLookup},
-	BuildStorage,
-};
-
-#[frame_support::pallet]
+use frame::testing_prelude::*;
+
+#[frame::pallet]
 mod pallet_test {
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);