mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 08: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:
@@ -536,7 +536,7 @@ impl<T: Config> Pallet<T> {
|
||||
// Update the start blocks of the previous and new current epoch.
|
||||
<EpochStart<T>>::mutate(|(previous_epoch_start_block, current_epoch_start_block)| {
|
||||
*previous_epoch_start_block = sp_std::mem::take(current_epoch_start_block);
|
||||
*current_epoch_start_block = <frame_system::Module<T>>::block_number();
|
||||
*current_epoch_start_block = <frame_system::Pallet<T>>::block_number();
|
||||
});
|
||||
|
||||
// After we update the current epoch, we signal the *next* epoch change
|
||||
|
||||
@@ -51,14 +51,14 @@ 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>},
|
||||
Historical: pallet_session_historical::{Module},
|
||||
Offences: pallet_offences::{Module, Call, Storage, Event},
|
||||
Babe: pallet_babe::{Module, Call, Storage, Config, ValidateUnsigned},
|
||||
Staking: pallet_staking::{Module, Call, Storage, Config<T>, Event<T>},
|
||||
Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
|
||||
Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
|
||||
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
|
||||
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
Historical: pallet_session_historical::{Pallet},
|
||||
Offences: pallet_offences::{Pallet, Call, Storage, Event},
|
||||
Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
|
||||
Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
|
||||
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -104,7 +104,7 @@ where
|
||||
|
||||
impl_opaque_keys! {
|
||||
pub struct MockSessionKeys {
|
||||
pub babe_authority: super::Module<Test>,
|
||||
pub babe_authority: super::Pallet<Test>,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ impl pallet_staking::Config for Test {
|
||||
type SlashDeferDuration = SlashDeferDuration;
|
||||
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
|
||||
type SessionInterface = Self;
|
||||
type UnixTime = pallet_timestamp::Module<Test>;
|
||||
type UnixTime = pallet_timestamp::Pallet<Test>;
|
||||
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
|
||||
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
|
||||
type NextNewSession = Session;
|
||||
|
||||
@@ -143,6 +143,6 @@ impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for CurrentBlockRan
|
||||
T::Hashing::hash(&subject[..])
|
||||
});
|
||||
|
||||
(random, <frame_system::Module<T>>::block_number())
|
||||
(random, <frame_system::Pallet<T>>::block_number())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user