Migrate pallet-beefy and pallet-beefy-mmr to use umbrella crate

substrate/frame/Cargo.toml

@@ -48,7 +48,7 @@ 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-staking = { optional = true, workspace = true }
 frame-executive = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { optional = true, workspace = true }
 
@@ -111,6 +111,7 @@ std = [
 	"sp-storage/std",
 	"sp-transaction-pool?/std",
 	"sp-version?/std",
+	"sp-staking/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

substrate/frame/beefy-mmr/Cargo.toml

@@ -15,62 +15,42 @@ workspace = true
 array-bytes = { optional = true, workspace = true, default-features = true }
 binary-merkle-tree = { workspace = true }
 codec = { features = ["derive"], workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["runtime"] }
 log = { workspace = true }
 pallet-beefy = { workspace = true }
 pallet-mmr = { workspace = true }
 pallet-session = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
-sp-api = { workspace = true }
 sp-consensus-beefy = { workspace = true }
-sp-core = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-staking = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
 std = [
 	"array-bytes",
 	"binary-merkle-tree/std",
 	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
+	"frame/std",
 	"log/std",
 	"pallet-beefy/std",
 	"pallet-mmr/std",
 	"pallet-session/std",
 	"scale-info/std",
 	"serde",
-	"sp-api/std",
 	"sp-consensus-beefy/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-staking/std",
 	"sp-state-machine/std",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
 	"pallet-beefy/try-runtime",
+	"frame/try-runtime",
 	"pallet-mmr/try-runtime",
 	"pallet-session/try-runtime",
-	"sp-runtime/try-runtime",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks",
+	"frame/runtime-benchmarks",
 ]

substrate/frame/beefy-mmr/src/benchmarking.rs

@@ -22,12 +22,9 @@
 use super::*;
 use crate::Pallet as BeefyMmr;
 use codec::Encode;
-use frame_benchmarking::v2::*;
-use frame_support::traits::Hooks;
-use frame_system::{Config as SystemConfig, Pallet as System};
+use frame::benchmarking::prelude::Pallet as System;
 use pallet_mmr::{Nodes, Pallet as Mmr};
 use sp_consensus_beefy::Payload;
-use sp_runtime::traits::One;
 
 pub trait Config:
 	pallet_mmr::Config<Hashing = sp_consensus_beefy::MmrHashing> + crate::Config

substrate/frame/beefy-mmr/src/lib.rs

@@ -35,12 +35,6 @@
 
 extern crate alloc;
 
-use sp_runtime::{
-	generic::OpaqueDigestItemId,
-	traits::{Convert, Header, Member},
-	SaturatedConversion,
-};
-
 use alloc::vec::Vec;
 use codec::Decode;
 use pallet_mmr::{primitives::AncestryProof, LeafDataProvider, NodesUtils, ParentNumberAndHash};
@@ -51,8 +45,7 @@ use sp_consensus_beefy::{
 	ValidatorSet as BeefyValidatorSet,
 };
 
-use frame_support::{crypto::ecdsa::ECDSAExt, pallet_prelude::Weight, traits::Get};
-use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor};
+use frame::{prelude::*, runtime::apis::decl_runtime_apis};
 
 pub use pallet::*;
 pub use weights::WeightInfo;
@@ -73,7 +66,7 @@ where
 	T: pallet_beefy::Config,
 {
 	fn on_new_root(root: &sp_consensus_beefy::MmrRootHash) {
-		let digest = sp_runtime::generic::DigestItem::Consensus(
+		let digest = DigestItem::Consensus(
 			sp_consensus_beefy::BEEFY_ENGINE_ID,
 			codec::Encode::encode(&sp_consensus_beefy::ConsensusLog::<
 				<T as pallet_beefy::Config>::BeefyId,
@@ -87,7 +80,7 @@ where
 pub struct BeefyEcdsaToEthereum;
 impl Convert<sp_consensus_beefy::ecdsa_crypto::AuthorityId, Vec<u8>> for BeefyEcdsaToEthereum {
 	fn convert(beefy_id: sp_consensus_beefy::ecdsa_crypto::AuthorityId) -> Vec<u8> {
-		sp_core::ecdsa::Public::from(beefy_id)
+		frame::deps::sp_core::ecdsa::Public::from(beefy_id)
 			.to_eth_address()
 			.map(|v| v.to_vec())
 			.map_err(|_| {
@@ -97,14 +90,13 @@ impl Convert<sp_consensus_beefy::ecdsa_crypto::AuthorityId, Vec<u8>> for BeefyEc
 	}
 }
 
-type MerkleRootOf<T> = <<T as pallet_mmr::Config>::Hashing as sp_runtime::traits::Hash>::Output;
+type MerkleRootOf<T> = <<T as pallet_mmr::Config>::Hashing as Hash>::Output;
 
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	#![allow(missing_docs)]
 
 	use super::*;
-	use frame_support::pallet_prelude::*;
 
 	/// BEEFY-MMR pallet.
 	#[pallet::pallet]
@@ -377,7 +369,7 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
-sp_api::decl_runtime_apis! {
+decl_runtime_apis! {
 	/// API useful for BEEFY light clients.
 	pub trait BeefyMmrApi<H>
 	where

substrate/frame/beefy-mmr/src/mock.rs

@@ -18,34 +18,24 @@
 use std::vec;
 
 use codec::Encode;
-use frame_support::{
-	construct_runtime, derive_impl, parameter_types,
-	traits::{ConstU32, ConstU64},
-};
+
 use sp_consensus_beefy::mmr::MmrLeafVersion;
-use sp_io::TestExternalities;
-use sp_runtime::{
-	app_crypto::ecdsa::Public,
-	impl_opaque_keys,
-	traits::{ConvertInto, Keccak256, OpaqueKeys},
-	BuildStorage,
-};
+
 use sp_state_machine::BasicExternalities;
 
 use crate as pallet_beefy_mmr;
 
 pub use sp_consensus_beefy::{
 	ecdsa_crypto::AuthorityId as BeefyId, mmr::BeefyDataProvider, ConsensusLog, BEEFY_ENGINE_ID,
 };
-use sp_core::offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt};
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {
 		pub dummy: pallet_beefy::Pallet<Test>,
 	}
 }
 
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = MockBlock<Test>;
 
 construct_runtime!(
 	pub enum Test
@@ -170,11 +160,11 @@ pub fn mock_authorities(vec: Vec<u8>) -> Vec<(u64, BeefyId)> {
 	vec.into_iter().map(|id| ((id as u64), mock_beefy_id(id))).collect()
 }
 
-pub fn new_test_ext(ids: Vec<u8>) -> TestExternalities {
+pub fn new_test_ext(ids: Vec<u8>) -> TestState {
 	new_test_ext_raw_authorities(mock_authorities(ids))
 }
 
-pub fn new_test_ext_raw_authorities(authorities: Vec<(u64, BeefyId)>) -> TestExternalities {
+pub fn new_test_ext_raw_authorities(authorities: Vec<(u64, BeefyId)>) -> TestState {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	let session_keys: Vec<_> = authorities
@@ -193,7 +183,7 @@ pub fn new_test_ext_raw_authorities(authorities: Vec<(u64, BeefyId)>) -> TestExt
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	let mut ext: TestExternalities = t.into();
+	let mut ext: TestState = t.into();
 	let (offchain, _offchain_state) = TestOffchainExt::with_offchain_db(ext.offchain_db());
 	ext.register_extension(OffchainDbExt::new(offchain.clone()));
 	ext.register_extension(OffchainWorkerExt::new(offchain));

substrate/frame/beefy-mmr/src/tests.rs

@@ -24,11 +24,7 @@ use sp_consensus_beefy::{
 	AncestryHelper, Commitment, Payload, ValidatorSet,
 };
 
-use sp_core::H256;
-use sp_io::TestExternalities;
-use sp_runtime::{traits::Keccak256, DigestItem};
-
-use frame_support::traits::OnInitialize;
+use frame::traits::OnInitialize;
 
 use crate::mock::*;
 
@@ -43,7 +39,7 @@ pub fn beefy_log(log: ConsensusLog<BeefyId>) -> DigestItem {
 	DigestItem::Consensus(BEEFY_ENGINE_ID, log.encode())
 }
 
-fn read_mmr_leaf(ext: &mut TestExternalities, key: Vec<u8>) -> MmrLeaf {
+fn read_mmr_leaf(ext: &mut TestState, key: Vec<u8>) -> MmrLeaf {
 	type Node = pallet_mmr::primitives::DataOrHash<Keccak256, MmrLeaf>;
 	ext.persist_offchain_overlay();
 	let offchain_db = ext.offchain_db();

substrate/frame/beefy/Cargo.toml

@@ -13,17 +13,13 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["runtime"] }
 log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
 sp-consensus-beefy = { features = ["serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
-sp-session = { workspace = true }
-sp-staking = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
 frame-election-provider-support = { workspace = true, default-features = true }
@@ -32,18 +28,14 @@ pallet-offences = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-staking = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
+	"frame/std",
 	"frame-election-provider-support/std",
-	"frame-support/std",
-	"frame-system/std",
 	"log/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
@@ -54,22 +46,15 @@ std = [
 	"scale-info/std",
 	"serde/std",
 	"sp-consensus-beefy/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-staking/std",
 	"sp-state-machine/std",
 ]
 try-runtime = [
 	"frame-election-provider-support/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
+	"frame/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-offences/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime",
 ]

substrate/frame/beefy/src/default_weights.rs

@@ -18,10 +18,7 @@
 //! Default weights for the BEEFY Pallet
 //! This file was not auto-generated.
 
-use frame_support::weights::{
-	constants::{RocksDbWeight as DbWeight, WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_NANOS},
-	Weight,
-};
+use frame::weights_prelude::*;
 
 impl crate::WeightInfo for () {
 	fn report_voting_equivocation(