Migrate pallet-metadata-hash-extension to use umbrella crate

substrate/frame/metadata-hash-extension/Cargo.toml

@@ -11,18 +11,15 @@ description = "FRAME signed extension for verifying the metadata hash"
 [dependencies]
 array-bytes = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"]}
 const-hex = { workspace = true }
 docify = { workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
 frame-metadata = { features = ["current", "unstable"], workspace = true, default-features = true }
 merkleized-metadata = { workspace = true }
-sp-api = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
@@ -32,10 +29,8 @@ substrate-wasm-builder = { features = ["metadata-hash"], workspace = true, defau
 default = ["std"]
 std = [
 	"codec/std",
+	"frame/std",
 	"const-hex/std",
-	"frame-support/std",
-	"frame-system/std",
 	"log/std",
 	"scale-info/std",
-	"sp-runtime/std",
 ]

substrate/frame/metadata-hash-extension/src/lib.rs

@@ -39,14 +39,9 @@ extern crate alloc;
 extern crate self as frame_metadata_hash_extension;
 
 use codec::{Decode, Encode};
-use frame_support::{pallet_prelude::Weight, DebugNoBound};
+use frame::prelude::*;
 use frame_system::Config;
 use scale_info::TypeInfo;
-use sp_runtime::{
-	impl_tx_ext_default,
-	traits::TransactionExtension,
-	transaction_validity::{TransactionValidityError, UnknownTransaction},
-};
 
 #[cfg(test)]
 mod tests;

substrate/frame/metadata-hash-extension/src/tests.rs

@@ -18,26 +18,21 @@
 use crate::CheckMetadataHash;
 use codec::{Decode, Encode};
 use frame_metadata::RuntimeMetadataPrefixed;
-use frame_support::{
-	derive_impl,
-	pallet_prelude::{InvalidTransaction, TransactionValidityError},
-};
+use frame::testing_prelude::*;
+
 use merkleized_metadata::{generate_metadata_digest, ExtraInfo};
-use sp_api::{Metadata, ProvideRuntimeApi};
-use sp_runtime::{
-	traits::{ExtrinsicLike, TransactionExtension},
-	transaction_validity::{TransactionSource, UnknownTransaction},
-};
+use frame::deps::sp_api::{Metadata, ProvideRuntimeApi};
+
 use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
 use substrate_test_runtime_client::{
 	prelude::*,
 	runtime::{self, ExtrinsicBuilder},
 	DefaultTestClientBuilderExt, TestClientBuilder,
 };
 
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = MockBlock<Test>;
 
-frame_support::construct_runtime! {
+construct_runtime! {
 	pub enum Test {
 		System: frame_system,
 	}
@@ -126,7 +121,7 @@ mod docs {
 
 	#[docify::export]
 	mod add_metadata_hash_extension {
-		frame_support::construct_runtime! {
+		construct_runtime! {
 			pub enum Runtime {
 				System: frame_system,
 			}

substrate/frame/src/lib.rs

@@ -231,9 +231,14 @@ pub mod prelude {
 
 	/// Runtime traits
 	#[doc(no_inline)]
-	pub use sp_runtime::traits::{
-		BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, ReduceBy,
-		ReplaceWithDefault, SaturatedConversion, Saturating, StaticLookup, TrailingZeroInput,
+	pub use sp_runtime::{
+		impl_tx_ext_default,
+		traits::{
+			BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, ExtrinsicLike,
+			ReduceBy, ReplaceWithDefault, SaturatedConversion, Saturating, StaticLookup,
+			TrailingZeroInput, TransactionExtension,
+		},
+		transaction_validity::{TransactionSource, UnknownTransaction},
 	};
 	/// Other error/result types for runtime
 	#[doc(no_inline)]