mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 17:31:05 +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:
@@ -191,7 +191,7 @@ decl_event!(
|
||||
{
|
||||
/// Swap created. \[account, proof, swap\]
|
||||
NewSwap(AccountId, HashedProof, PendingSwap),
|
||||
/// Swap claimed. The last parameter indicates whether the execution succeeds.
|
||||
/// Swap claimed. The last parameter indicates whether the execution succeeds.
|
||||
/// \[account, proof, success\]
|
||||
SwapClaimed(AccountId, HashedProof, bool),
|
||||
/// Swap cancelled. \[account, proof\]
|
||||
@@ -237,7 +237,7 @@ decl_module! {
|
||||
let swap = PendingSwap {
|
||||
source,
|
||||
action,
|
||||
end_block: frame_system::Module::<T>::block_number() + duration,
|
||||
end_block: frame_system::Pallet::<T>::block_number() + duration,
|
||||
};
|
||||
PendingSwaps::<T>::insert(target.clone(), hashed_proof.clone(), swap.clone());
|
||||
|
||||
@@ -307,7 +307,7 @@ decl_module! {
|
||||
Error::<T>::SourceMismatch,
|
||||
);
|
||||
ensure!(
|
||||
frame_system::Module::<T>::block_number() >= swap.end_block,
|
||||
frame_system::Pallet::<T>::block_number() >= swap.end_block,
|
||||
Error::<T>::DurationNotPassed,
|
||||
);
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ 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>},
|
||||
AtomicSwap: pallet_atomic_swap::{Module, Call, Event<T>},
|
||||
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
|
||||
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
||||
AtomicSwap: pallet_atomic_swap::{Pallet, Call, Event<T>},
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user