pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 18:07:58 +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/extensions/check_genesis.rs
+2 -2
View File
@@ -16,7 +16,7 @@
// limitations under the License.
use codec::{Encode, Decode};
use crate::{Config, Module};
use crate::{Config, Pallet};
use sp_runtime::{
traits::{SignedExtension, Zero},
transaction_validity::TransactionValidityError,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
const IDENTIFIER: &'static str = "CheckGenesis";
fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
Ok(<Module<T>>::block_hash(T::BlockNumber::zero()))
Ok(<Pallet<T>>::block_hash(T::BlockNumber::zero()))
}
}
substrate/frame/system/src/extensions/check_mortality.rs
+4 -4
View File
@@ -16,7 +16,7 @@
// limitations under the License.
use codec::{Encode, Decode};
use crate::{Config, Module, BlockHash};
use crate::{Config, Pallet, BlockHash};
use sp_runtime::{
generic::Era,
traits::{SignedExtension, DispatchInfoOf, SaturatedConversion},
@@ -62,7 +62,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
_info: &DispatchInfoOf<Self::Call>,
_len: usize,
) -> TransactionValidity {
let current_u64 = <Module<T>>::block_number().saturated_into::<u64>();
let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
let valid_till = self.0.death(current_u64);
Ok(ValidTransaction {
longevity: valid_till.saturating_sub(current_u64),
@@ -71,12 +71,12 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
}
fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
let current_u64 = <Module<T>>::block_number().saturated_into::<u64>();
let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
let n = self.0.birth(current_u64).saturated_into::<T::BlockNumber>();
if !<BlockHash<T>>::contains_key(n) {
Err(InvalidTransaction::AncientBirthBlock.into())
} else {
Ok(<Module<T>>::block_hash(n))
Ok(<Pallet<T>>::block_hash(n))
}
}
}
substrate/frame/system/src/extensions/check_spec_version.rs
+2 -2
View File
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::{Config, Module};
use crate::{Config, Pallet};
use codec::{Encode, Decode};
use sp_runtime::{
traits::SignedExtension,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckSpecVersion<T> {
const IDENTIFIER: &'static str = "CheckSpecVersion";
fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
Ok(<Module<T>>::runtime_version().spec_version)
Ok(<Pallet<T>>::runtime_version().spec_version)
}
}
substrate/frame/system/src/extensions/check_tx_version.rs
+2 -2
View File
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::{Config, Module};
use crate::{Config, Pallet};
use codec::{Encode, Decode};
use sp_runtime::{
traits::SignedExtension,
@@ -53,6 +53,6 @@ impl<T: Config + Send + Sync> SignedExtension for CheckTxVersion<T> {
const IDENTIFIER: &'static str = "CheckTxVersion";
fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
Ok(<Module<T>>::runtime_version().transaction_version)
Ok(<Pallet<T>>::runtime_version().transaction_version)
}
}
substrate/frame/system/src/extensions/check_weight.rs
+3 -3
View File
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::{limits::BlockWeights, Config, Module};
use crate::{limits::BlockWeights, Config, Pallet};
use codec::{Encode, Decode};
use sp_runtime::{
traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
@@ -58,7 +58,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
info: &DispatchInfoOf<T::Call>,
) -> Result<crate::ConsumedWeight, TransactionValidityError> {
let maximum_weight = T::BlockWeights::get();
let all_weight = Module::<T>::block_weight();
let all_weight = Pallet::<T>::block_weight();
calculate_consumed_weight::<T::Call>(maximum_weight, all_weight, info)
}
@@ -70,7 +70,7 @@ impl<T: Config + Send + Sync> CheckWeight<T> where
len: usize,
) -> Result<u32, TransactionValidityError> {
let length_limit = T::BlockLength::get();
let current_len = Module::<T>::all_extrinsics_len();
let current_len = Pallet::<T>::all_extrinsics_len();
let added_len = len as u32;
let next_len = current_len.saturating_add(added_len);
if next_len > *length_limit.max.get(info.class) {
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(())
}
}
substrate/frame/system/src/mock.rs
+1 -1
View File
@@ -33,7 +33,7 @@ frame_support::construct_runtime!(
NodeBlock = Block,
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Module, Call, Config, Storage, Event<T>},
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
}
);