pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 01:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

ModuleId to PalletId - part of #8372 (#8477)

Browse Source 
* `ModuleId` to `PalletId` - part of #8372

* fix doc

* move `PalletId` to `frame-support`

* fix compile

* fix tests

* `ModuleId` to `PalletId`

* subcommand `moduleid` to `palletid`
This commit is contained in:
Xavier Lau
2021-04-09 17:15:40 +08:00
committed by GitHub
parent c675310227
commit d6f0ce0551
20 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/elections/src/lib.rs
+5 -5
View File
@@ -156,7 +156,7 @@ pub trait Config: frame_system::Config {
type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
/// Identifier for the elections pallet's lock
type ModuleId: Get<LockIdentifier>;
type PalletId: Get<LockIdentifier>;
/// The currency that people are electing with.
type Currency:
@@ -391,7 +391,7 @@ decl_module! {
/// The chunk size of the approval vector.
const APPROVAL_SET_SIZE: u32 = APPROVAL_SET_SIZE as u32;
const ModuleId: LockIdentifier = T::ModuleId::get();
const PalletId: LockIdentifier = T::PalletId::get();
fn deposit_event() = default;
@@ -491,7 +491,7 @@ decl_module! {
);
T::Currency::remove_lock(
T::ModuleId::get(),
T::PalletId::get(),
if valid { &who } else { &reporter }
);
@@ -529,7 +529,7 @@ decl_module! {
Self::remove_voter(&who, index);
T::Currency::unreserve(&who, T::VotingBond::get());
T::Currency::remove_lock(T::ModuleId::get(), &who);
T::Currency::remove_lock(T::PalletId::get(), &who);
}
/// Submit oneself for candidacy.
@@ -890,7 +890,7 @@ impl<T: Config> Module<T> {
}
T::Currency::set_lock(
T::ModuleId::get(),
T::PalletId::get(),
&who,
locked_balance,
WithdrawReasons::all(),
substrate/frame/elections/src/mock.rs
+2 -2
View File
@@ -103,7 +103,7 @@ impl ChangeMembers<u64> for TestChangeMembers {
}
parameter_types!{
pub const ElectionModuleId: LockIdentifier = *b"py/elect";
pub const ElectionPalletId: LockIdentifier = *b"py/elect";
}
impl elections::Config for Test {
@@ -123,7 +123,7 @@ impl elections::Config for Test {
type InactiveGracePeriod = InactiveGracePeriod;
type VotingPeriod = VotingPeriod;
type DecayRatio = DecayRatio;
type ModuleId = ElectionModuleId;
type PalletId = ElectionPalletId;
}
pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;