pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 21:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'Module' with 'Pallet' in construct_runtime macro (#8372)

Browse Source 
* 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:
Shaun Wang
2021-03-18 21:50:08 +13:00
committed by GitHub
parent 05f24931a9
commit 2e5522444a
157 changed files with 881 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/system/src/lib.rs
+12 -12
View File
@@ -1022,7 +1022,7 @@ pub enum IncRefError {
NoProviders,
}
impl<T: Config> Module<T> {
impl<T: Config> Pallet<T> {
pub fn account_exists(who: &T::AccountId) -> bool {
Account::<T>::contains_key(who)
}
@@ -1083,7 +1083,7 @@ impl<T: Config> Module<T> {
(1, 0, 0) => {
// No providers left (and no consumers) and no sufficients. Account dead.
Module::<T>::on_killed_account(who.clone());
Pallet::<T>::on_killed_account(who.clone());
Ok(DecRefStatus::Reaped)
}
(1, c, _) if c > 0 => {
@@ -1136,7 +1136,7 @@ impl<T: Config> Module<T> {
}
match (account.sufficients, account.providers) {
(0, 0) | (1, 0) => {
Module::<T>::on_killed_account(who.clone());
Pallet::<T>::on_killed_account(who.clone());
DecRefStatus::Reaped
}
(x, _) => {
@@ -1450,9 +1450,9 @@ impl<T: Config> Module<T> {
Ok(_) => Event::ExtrinsicSuccess(info),
Err(err) => {
log::trace!(
target: "runtime::system",
"Extrinsic failed at block({:?}): {:?}",
Self::block_number(),
target: "runtime::system",
"Extrinsic failed at block({:?}): {:?}",
Self::block_number(),
err,
);
Event::ExtrinsicFailed(err.error, info)
@@ -1520,11 +1520,11 @@ impl<T: Config> Module<T> {
pub struct Provider<T>(PhantomData<T>);
impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::inc_providers(t);
Pallet::<T>::inc_providers(t);
Ok(())
}
fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::dec_providers(t)
Pallet::<T>::dec_providers(t)
.map(|_| ())
.or_else(|e| match e {
DecRefError::ConsumerRemaining => Err(StoredMapError::ConsumerRemaining),
@@ -1536,11 +1536,11 @@ impl<T: Config> HandleLifetime<T::AccountId> for Provider<T> {
pub struct SelfSufficient<T>(PhantomData<T>);
impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::inc_sufficients(t);
Pallet::<T>::inc_sufficients(t);
Ok(())
}
fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::dec_sufficients(t);
Pallet::<T>::dec_sufficients(t);
Ok(())
}
}
@@ -1549,13 +1549,13 @@ impl<T: Config> HandleLifetime<T::AccountId> for SelfSufficient<T> {
pub struct Consumer<T>(PhantomData<T>);
impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
fn created(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::inc_consumers(t)
Pallet::<T>::inc_consumers(t)
.map_err(|e| match e {
IncRefError::NoProviders => StoredMapError::NoProviders
})
}
fn killed(t: &T::AccountId) -> Result<(), StoredMapError> {
Module::<T>::dec_consumers(t);
Pallet::<T>::dec_consumers(t);
Ok(())
}
}