Migrate pallet-tx-pause to umbrella crate

prdoc/pr_6630.prdoc

@@ -0,0 +1,14 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: migrate pallet-tx-pause to umbrella crate
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      This pull request adapts the frame umbrella crate into pallet-tx-pause
+      by importing existing systems into the pallet.
+
+crates:
+  - name: pallet-tx-pause
+    bump: minor

substrate/frame/tx-pause/Cargo.toml

@@ -17,18 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
 scale-info = { features = ["derive"], workspace = true }
-sp-runtime = { workspace = true }
 pallet-balances = { optional = true, workspace = true }
 pallet-utility = { optional = true, workspace = true }
 pallet-proxy = { optional = true, workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
@@ -37,31 +32,21 @@ pallet-proxy = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
+	"frame/std",
 	"pallet-balances?/std",
 	"pallet-proxy?/std",
 	"pallet-utility?/std",
 	"scale-info/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
+	"frame/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
+	"frame/try-runtime",
 	"pallet-balances?/try-runtime",
 	"pallet-proxy?/try-runtime",
 	"pallet-utility?/try-runtime",
-	"sp-runtime/try-runtime",
 ]

substrate/frame/tx-pause/src/benchmarking.rs

@@ -19,7 +19,7 @@
 
 use super::{Pallet as TxPause, *};
 use alloc::vec;
-use frame_benchmarking::v2::*;
+use frame::benchmarking::prelude::*;
 
 #[benchmarks]
 mod benchmarks {

substrate/frame/tx-pause/src/lib.rs

@@ -78,15 +78,14 @@ pub mod weights;
 extern crate alloc;
 
 use alloc::vec::Vec;
-use frame_support::{
-	dispatch::GetDispatchInfo,
-	pallet_prelude::*,
-	traits::{CallMetadata, Contains, GetCallMetadata, IsSubType, IsType},
-	DefaultNoBound,
+use frame::{
+	deps::frame_support::{dispatch::GetDispatchInfo, DefaultNoBound},
+	prelude::*,
+	traits::{
+		CallMetadata, Contains, Dispatchable, GetCallMetadata, IsSubType, IsType, TransactionPause,
+		TransactionPauseError,
+	},
 };
-use frame_system::pallet_prelude::*;
-use sp_runtime::{traits::Dispatchable, DispatchResult};
-
 pub use pallet::*;
 pub use weights::*;
 
@@ -101,7 +100,8 @@ pub type PalletCallNameOf<T> = BoundedVec<u8, <T as Config>::MaxNameLen>;
 /// to partially or fully specify an item a variant of a  [`Config::RuntimeCall`].
 pub type RuntimeCallNameOf<T> = (PalletNameOf<T>, PalletCallNameOf<T>);
 
-#[frame_support::pallet]
+// #[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	use super::*;
 
@@ -294,7 +294,7 @@ where
 	}
 }
 
-impl<T: Config> frame_support::traits::TransactionPause for Pallet<T> {
+impl<T: Config> TransactionPause for Pallet<T> {
 	type CallIdentifier = RuntimeCallNameOf<T>;
 
 	fn is_paused(full_name: Self::CallIdentifier) -> bool {
@@ -305,20 +305,16 @@ impl<T: Config> frame_support::traits::TransactionPause for Pallet<T> {
 		Self::ensure_can_pause(&full_name).is_ok()
 	}
 
-	fn pause(
-		full_name: Self::CallIdentifier,
-	) -> Result<(), frame_support::traits::TransactionPauseError> {
+	fn pause(full_name: Self::CallIdentifier) -> Result<(), TransactionPauseError> {
 		Self::do_pause(full_name).map_err(Into::into)
 	}
 
-	fn unpause(
-		full_name: Self::CallIdentifier,
-	) -> Result<(), frame_support::traits::TransactionPauseError> {
+	fn unpause(full_name: Self::CallIdentifier) -> Result<(), TransactionPauseError> {
 		Self::do_unpause(full_name).map_err(Into::into)
 	}
 }
 
-impl<T: Config> From<Error<T>> for frame_support::traits::TransactionPauseError {
+impl<T: Config> From<Error<T>> for TransactionPauseError {
 	fn from(err: Error<T>) -> Self {
 		match err {
 			Error::<T>::NotFound => Self::NotFound,

substrate/frame/tx-pause/src/mock.rs

@@ -21,13 +21,17 @@
 
 use super::*;
 use crate as pallet_tx_pause;
-
-use frame_support::{
-	derive_impl, parameter_types,
-	traits::{ConstU64, Everything, InsideBoth, InstanceFilter},
+use frame::{
+	prelude::frame_system,
+	runtime::{
+		prelude::{
+			construct_runtime, derive_impl, ord_parameter_types, parameter_types, EnsureSignedBy,
+		},
+		testing_prelude::BuildStorage,
+	},
+	testing_prelude::TestExternalities,
+	traits::{BlakeTwo256, ConstU64, Everything, InsideBoth, InstanceFilter},
 };
-use frame_system::EnsureSignedBy;
-use sp_runtime::{traits::BlakeTwo256, BuildStorage};
 
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
 impl frame_system::Config for Test {
@@ -112,7 +116,7 @@ parameter_types! {
 	pub const MaxNameLen: u32 = 50;
 }
 
-frame_support::ord_parameter_types! {
+ord_parameter_types! {
 	pub const PauseOrigin: u64 = 1;
 	pub const UnpauseOrigin: u64 = 2;
 }
@@ -140,7 +144,7 @@ impl Config for Test {
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
-frame_support::construct_runtime!(
+construct_runtime!(
 	pub enum Test
 	{
 		System: frame_system,
@@ -151,7 +155,7 @@ frame_support::construct_runtime!(
 	}
 );
 
-pub fn new_test_ext() -> sp_io::TestExternalities {
+pub fn new_test_ext() -> TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Test> {
@@ -165,7 +169,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	let mut ext = sp_io::TestExternalities::new(t);
+	let mut ext = TestExternalities::new(t);
 	ext.execute_with(|| {
 		System::set_block_number(1);
 	});

substrate/frame/tx-pause/src/tests.rs

@@ -19,10 +19,10 @@
 
 use super::*;
 use crate::mock::{RuntimeCall, *};
-
-use frame_support::{assert_err, assert_noop, assert_ok};
-use sp_runtime::DispatchError;
-
+use frame::{
+	deps::sp_runtime::DispatchError,
+	testing_prelude::{assert_err, assert_noop, assert_ok},
+};
 // GENERAL SUCCESS/POSITIVE TESTS ---------------------
 
 #[docify::export]