mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 18:07:58 +00:00
Replace 'Module' with 'Pallet' in construct_runtime macro (#8372)
* Use 'Pallet' struct in construct_runtime. * Fix genesis and metadata macro. * Fix 'Pallet' type alias. * Replace 'Module' with 'Pallet' for all construct_runtime use cases. * Replace more deprecated 'Module' struct. * Bring back AllModules and AllPalletsWithSystem type, but deprecate them. * Replace deprecated 'Module' struct from merge master. * Minor fix. * Fix UI tests. * Revert UI override in derive_no_bound. * Fix more deprecated 'Module' use from master branch. * Fix more deprecated 'Module' use from master branch.
This commit is contained in:
@@ -41,10 +41,10 @@ use sp_runtime::traits::{One, StaticLookup};
|
||||
|
||||
const MAX_VALIDATORS: u32 = 1000;
|
||||
|
||||
pub struct Module<T: Config>(pallet_session::Module<T>);
|
||||
pub struct Pallet<T: Config>(pallet_session::Module<T>);
|
||||
pub trait Config: pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config {}
|
||||
|
||||
impl<T: Config> OnInitialize<T::BlockNumber> for Module<T> {
|
||||
impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
|
||||
fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
|
||||
pallet_session::Module::<T>::on_initialize(n)
|
||||
}
|
||||
@@ -157,7 +157,7 @@ fn check_membership_proof_setup<T: Config>(
|
||||
Session::<T>::set_keys(RawOrigin::Signed(controller).into(), keys, proof).unwrap();
|
||||
}
|
||||
|
||||
Module::<T>::on_initialize(T::BlockNumber::one());
|
||||
Pallet::<T>::on_initialize(T::BlockNumber::one());
|
||||
|
||||
// skip sessions until the new validator set is enacted
|
||||
while Session::<T>::validators().len() < n as usize {
|
||||
@@ -170,7 +170,7 @@ fn check_membership_proof_setup<T: Config>(
|
||||
}
|
||||
|
||||
impl_benchmark_test_suite!(
|
||||
Module,
|
||||
Pallet,
|
||||
crate::mock::new_test_ext(),
|
||||
crate::mock::Test,
|
||||
extra = false,
|
||||
|
||||
@@ -37,10 +37,10 @@ frame_support::construct_runtime!(
|
||||
NodeBlock = Block,
|
||||
UncheckedExtrinsic = UncheckedExtrinsic,
|
||||
{
|
||||
System: frame_system::{Module, Call, Config, Storage, Event<T>},
|
||||
Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
|
||||
Staking: pallet_staking::{Module, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
|
||||
Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
|
||||
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
|
||||
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>, ValidateUnsigned},
|
||||
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -164,7 +164,7 @@ impl onchain::Config for Test {
|
||||
|
||||
impl pallet_staking::Config for Test {
|
||||
type Currency = Balances;
|
||||
type UnixTime = pallet_timestamp::Module<Self>;
|
||||
type UnixTime = pallet_timestamp::Pallet<Self>;
|
||||
type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
|
||||
type RewardRemainder = ();
|
||||
type Event = Event;
|
||||
|
||||
Reference in New Issue
Block a user