pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-24 15:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proposal: Flatten AllPallets and similar types (#11813)

Browse Source 
* flratten AllPallets types

* feature flag it

* fix

* fix

* fmt

* remove todo

* Update frame/support/src/traits/metadata.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update frame/support/src/migrations.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* fix

* mark as deprecated

* add docs

* fix ui test?

* fmt

Co-authored-by: parity-processbot <>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Kian Paimani
2022-08-14 20:06:02 +01:00
committed by GitHub
parent 6b0203c8c4
commit 2d988e5f60
15 changed files with 122 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/Cargo.toml
+4
View File
@@ -73,3 +73,7 @@ no-metadata-docs = ["frame-support-procedural/no-metadata-docs"]
# By default some types have documentation, `full-metadata-docs` allows to add documentation to # By default some types have documentation, `full-metadata-docs` allows to add documentation to
# more types in the metadata. # more types in the metadata.
full-metadata-docs = ["scale-info/docs"] full-metadata-docs = ["scale-info/docs"]
# Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
# pallets in a runtime grows. Does increase the compile time!
tuples-96 = []
tuples-128 = []
substrate/frame/support/procedural/src/construct_runtime/mod.rs
+21 -39
View File
@@ -308,47 +308,26 @@ fn decl_all_pallets<'a>(
names.push(&pallet_declaration.name); names.push(&pallet_declaration.name);
} }
// Make nested tuple structure like:
// `((FirstPallet, (SecondPallet, ( ... , LastPallet) ... ))))`
// But ignore the system pallet.
let all_pallets_without_system = names
.iter()
.filter(|n| **n != SYSTEM_PALLET_NAME)
.rev()
.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
// Make nested tuple structure like:
// `((FirstPallet, (SecondPallet, ( ... , LastPallet) ... ))))`
let all_pallets_with_system = names
.iter()
.rev()
.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
// Make nested tuple structure like:
// `((LastPallet, (SecondLastPallet, ( ... , FirstPallet) ... ))))`
// But ignore the system pallet.
let all_pallets_without_system_reversed = names
.iter()
.filter(|n| **n != SYSTEM_PALLET_NAME)
.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
// Make nested tuple structure like:
// `((LastPallet, (SecondLastPallet, ( ... , FirstPallet) ... ))))`
let all_pallets_with_system_reversed = names
.iter()
.fold(TokenStream2::default(), |combined, name| quote!((#name, #combined)));
let system_pallet = match names.iter().find(|n| **n == SYSTEM_PALLET_NAME) { let system_pallet = match names.iter().find(|n| **n == SYSTEM_PALLET_NAME) {
Some(name) => name, Some(name) => name,
None => None =>
return syn::Error::new( return syn::Error::new(
proc_macro2::Span::call_site(), proc_macro2::Span::call_site(),
"`System` pallet declaration is missing. \ "`System` pallet declaration is missing. \
Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`", Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`",
) )
.into_compile_error(), .into_compile_error(),
}; };
let names_without_system =
names.iter().filter(|n| **n != SYSTEM_PALLET_NAME).collect::<Vec<_>>();
let names_reversed = names.clone().into_iter().rev().collect::<Vec<_>>();
let names_without_system_reverse =
names_without_system.clone().into_iter().rev().collect::<Vec<_>>();
let names_reversed_with_system_first = std::iter::once(system_pallet)
.chain(names_without_system_reverse.clone().into_iter())
.collect::<Vec<_>>();
quote!( quote!(
#types #types
@@ -364,25 +343,28 @@ fn decl_all_pallets<'a>(
pub type AllPallets = AllPalletsWithSystem; pub type AllPallets = AllPalletsWithSystem;
/// All pallets included in the runtime as a nested tuple of types. /// All pallets included in the runtime as a nested tuple of types.
pub type AllPalletsWithSystem = ( #all_pallets_with_system ); pub type AllPalletsWithSystem = ( #(#names),* );
/// All pallets included in the runtime as a nested tuple of types. /// All pallets included in the runtime as a nested tuple of types.
/// Excludes the System pallet. /// Excludes the System pallet.
pub type AllPalletsWithoutSystem = ( #all_pallets_without_system ); pub type AllPalletsWithoutSystem = ( #(#names_without_system),* );
/// All pallets included in the runtime as a nested tuple of types in reversed order. /// All pallets included in the runtime as a nested tuple of types in reversed order.
/// Excludes the System pallet. /// Excludes the System pallet.
pub type AllPalletsWithoutSystemReversed = ( #all_pallets_without_system_reversed ); #[deprecated(note = "Using reverse pallet orders is deprecated. use only \
`AllPalletWithSystem or AllPalletsWithoutSystem`")]
pub type AllPalletsWithoutSystemReversed =( #(#names_without_system_reverse),* );
/// All pallets included in the runtime as a nested tuple of types in reversed order. /// All pallets included in the runtime as a nested tuple of types in reversed order.
pub type AllPalletsWithSystemReversed = ( #all_pallets_with_system_reversed ); #[deprecated(note = "Using reverse pallet orders is deprecated. use only \
`AllPalletWithSystem or AllPalletsWithoutSystem`")]
pub type AllPalletsWithSystemReversed = ( #(#names_reversed),* );
/// All pallets included in the runtime as a nested tuple of types in reversed order. /// All pallets included in the runtime as a nested tuple of types in reversed order.
/// With the system pallet first. /// With the system pallet first.
pub type AllPalletsReversedWithSystemFirst = ( #[deprecated(note = "Using reverse pallet orders is deprecated. use only \
#system_pallet, `AllPalletWithSystem or AllPalletsWithoutSystem`")]
AllPalletsWithoutSystemReversed pub type AllPalletsReversedWithSystemFirst = ( #(#names_reversed_with_system_first),* );
);
) )
} }
substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+2 -4
View File
@@ -240,9 +240,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
#config_where_clause #config_where_clause
{ {
fn count() -> usize { 1 } fn count() -> usize { 1 }
fn accumulate( fn infos() -> #frame_support::sp_std::vec::Vec<#frame_support::traits::PalletInfoData> {
acc: &mut #frame_support::sp_std::vec::Vec<#frame_support::traits::PalletInfoData>
) {
use #frame_support::traits::PalletInfoAccess; use #frame_support::traits::PalletInfoAccess;
let item = #frame_support::traits::PalletInfoData { let item = #frame_support::traits::PalletInfoData {
index: Self::index(), index: Self::index(),
@@ -250,7 +248,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
module_name: Self::module_name(), module_name: Self::module_name(),
crate_version: Self::crate_version(), crate_version: Self::crate_version(),
}; };
acc.push(item); #frame_support::sp_std::vec![item]
} }
} }
substrate/frame/support/src/dispatch.rs
+2 -2
View File
@@ -2207,7 +2207,7 @@ macro_rules! decl_module {
for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )* for $mod_type<$trait_instance $(, $instance)?> where $( $other_where_bounds )*
{ {
fn count() -> usize { 1 } fn count() -> usize { 1 }
fn accumulate(acc: &mut $crate::sp_std::vec::Vec<$crate::traits::PalletInfoData>) { fn infos() -> $crate::sp_std::vec::Vec<$crate::traits::PalletInfoData> {
use $crate::traits::PalletInfoAccess; use $crate::traits::PalletInfoAccess;
let item = $crate::traits::PalletInfoData { let item = $crate::traits::PalletInfoData {
index: Self::index(), index: Self::index(),
@@ -2215,7 +2215,7 @@ macro_rules! decl_module {
module_name: Self::module_name(), module_name: Self::module_name(),
crate_version: Self::crate_version(), crate_version: Self::crate_version(),
}; };
acc.push(item); vec![item]
} }
} }
substrate/frame/support/src/lib.rs
+10
View File
@@ -16,6 +16,16 @@
// limitations under the License. // limitations under the License.
//! Support code for the runtime. //! Support code for the runtime.
//!
//! ## Note on Tuple Traits
//!
//! Many of the traits defined in [`traits`] have auto-implementations on tuples as well. Usually,
//! the tuple is a function of number of pallets in the runtime. By default, the traits are
//! implemented for tuples of up to 64 items.
//
// If you have more pallets in your runtime, or for any other reason need more, enabled `tuples-96`
// or the `tuples-128` complication flag. Note that these features *will increase* the compilation
// of this crate.
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
substrate/frame/support/src/migrations.rs
+4 -1
View File
@@ -19,6 +19,7 @@ use crate::{
traits::{GetStorageVersion, PalletInfoAccess}, traits::{GetStorageVersion, PalletInfoAccess},
weights::{RuntimeDbWeight, Weight}, weights::{RuntimeDbWeight, Weight},
}; };
use impl_trait_for_tuples::impl_for_tuples;
/// Trait used by [`migrate_from_pallet_version_to_storage_version`] to do the actual migration. /// Trait used by [`migrate_from_pallet_version_to_storage_version`] to do the actual migration.
pub trait PalletVersionToStorageVersionHelper { pub trait PalletVersionToStorageVersionHelper {
@@ -42,7 +43,9 @@ impl<T: GetStorageVersion + PalletInfoAccess> PalletVersionToStorageVersionHelpe
} }
} }
#[impl_trait_for_tuples::impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl PalletVersionToStorageVersionHelper for T { impl PalletVersionToStorageVersionHelper for T {
fn migrate(db_weight: &RuntimeDbWeight) -> Weight { fn migrate(db_weight: &RuntimeDbWeight) -> Weight {
let mut weight: Weight = 0; let mut weight: Weight = 0;
substrate/frame/support/src/traits.rs
+3 -2
View File
@@ -50,7 +50,7 @@ mod error;
pub use error::PalletError; pub use error::PalletError;
mod filter; mod filter;
pub use filter::{ClearFilterGuard, FilterStack, FilterStackGuard, InstanceFilter, IntegrityTest}; pub use filter::{ClearFilterGuard, FilterStack, FilterStackGuard, InstanceFilter};
mod misc; mod misc;
pub use misc::{ pub use misc::{
@@ -81,7 +81,8 @@ mod hooks;
#[cfg(feature = "std")] #[cfg(feature = "std")]
pub use hooks::GenesisBuild; pub use hooks::GenesisBuild;
pub use hooks::{ pub use hooks::{
Hooks, OnFinalize, OnGenesis, OnIdle, OnInitialize, OnRuntimeUpgrade, OnTimestampSet, Hooks, IntegrityTest, OnFinalize, OnGenesis, OnIdle, OnInitialize, OnRuntimeUpgrade,
OnTimestampSet,
}; };
#[cfg(feature = "try-runtime")] #[cfg(feature = "try-runtime")]
pub use hooks::{OnRuntimeUpgradeHelpersExt, ON_RUNTIME_UPGRADE_PREFIX}; pub use hooks::{OnRuntimeUpgradeHelpersExt, ON_RUNTIME_UPGRADE_PREFIX};
substrate/frame/support/src/traits/filter.rs
-11
View File
@@ -180,17 +180,6 @@ macro_rules! impl_filter_stack {
} }
} }
/// Type that provide some integrity tests.
///
/// This implemented for modules by `decl_module`.
#[impl_trait_for_tuples::impl_for_tuples(30)]
pub trait IntegrityTest {
/// Run integrity test.
///
/// The test is not executed in a externalities provided environment.
fn integrity_test() {}
}
#[cfg(test)] #[cfg(test)]
pub mod test_impl_filter_stack { pub mod test_impl_filter_stack {
use super::*; use super::*;
substrate/frame/support/src/traits/hooks.rs
+31 -6
View File
@@ -38,7 +38,9 @@ pub trait OnInitialize<BlockNumber> {
} }
} }
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple { impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
fn on_initialize(n: BlockNumber) -> crate::weights::Weight { fn on_initialize(n: BlockNumber) -> crate::weights::Weight {
let mut weight = 0; let mut weight = 0;
@@ -50,7 +52,9 @@ impl<BlockNumber: Clone> OnInitialize<BlockNumber> for Tuple {
/// The block finalization trait. /// The block finalization trait.
/// ///
/// Implementing this lets you express what should happen for your pallet when the block is ending. /// Implementing this lets you express what should happen for your pallet when the block is ending.
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OnFinalize<BlockNumber> { pub trait OnFinalize<BlockNumber> {
/// The block is being finalized. Implement to have something happen. /// The block is being finalized. Implement to have something happen.
/// ///
@@ -79,7 +83,9 @@ pub trait OnIdle<BlockNumber> {
} }
} }
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl<BlockNumber: Copy + AtLeast32BitUnsigned> OnIdle<BlockNumber> for Tuple { impl<BlockNumber: Copy + AtLeast32BitUnsigned> OnIdle<BlockNumber> for Tuple {
fn on_idle(n: BlockNumber, remaining_weight: crate::weights::Weight) -> crate::weights::Weight { fn on_idle(n: BlockNumber, remaining_weight: crate::weights::Weight) -> crate::weights::Weight {
let on_idle_functions: &[fn( let on_idle_functions: &[fn(
@@ -105,7 +111,9 @@ impl<BlockNumber: Copy + AtLeast32BitUnsigned> OnIdle<BlockNumber> for Tuple {
/// Implementing this trait for a pallet let's you express operations that should /// Implementing this trait for a pallet let's you express operations that should
/// happen at genesis. It will be called in an externalities provided environment and /// happen at genesis. It will be called in an externalities provided environment and
/// will see the genesis state after all pallets have written their genesis state. /// will see the genesis state after all pallets have written their genesis state.
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OnGenesis { pub trait OnGenesis {
/// Something that should happen at genesis. /// Something that should happen at genesis.
fn on_genesis() {} fn on_genesis() {}
@@ -187,7 +195,9 @@ pub trait OnRuntimeUpgrade {
} }
} }
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl OnRuntimeUpgrade for Tuple { impl OnRuntimeUpgrade for Tuple {
fn on_runtime_upgrade() -> crate::weights::Weight { fn on_runtime_upgrade() -> crate::weights::Weight {
let mut weight = 0; let mut weight = 0;
@@ -210,6 +220,19 @@ impl OnRuntimeUpgrade for Tuple {
} }
} }
/// Type that provide some integrity tests.
///
/// This implemented for modules by `decl_module`.
#[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait IntegrityTest {
/// Run integrity test.
///
/// The test is not executed in a externalities provided environment.
fn integrity_test() {}
}
/// The pallet hooks trait. Implementing this lets you express some logic to execute. /// The pallet hooks trait. Implementing this lets you express some logic to execute.
pub trait Hooks<BlockNumber> { pub trait Hooks<BlockNumber> {
/// The block is being finalized. Implement to have something happen. /// The block is being finalized. Implement to have something happen.
@@ -321,7 +344,9 @@ pub trait GenesisBuild<T, I = ()>: Default + sp_runtime::traits::MaybeSerializeD
} }
/// A trait which is called when the timestamp is set in the runtime. /// A trait which is called when the timestamp is set in the runtime.
#[impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OnTimestampSet<Moment> { pub trait OnTimestampSet<Moment> {
/// Called when the timestamp is set. /// Called when the timestamp is set.
fn on_timestamp_set(moment: Moment); fn on_timestamp_set(moment: Moment);
substrate/frame/support/src/traits/members.rs
+7 -2
View File
@@ -17,6 +17,7 @@
//! Traits for dealing with the idea of membership. //! Traits for dealing with the idea of membership.
use impl_trait_for_tuples::impl_for_tuples;
use sp_std::{marker::PhantomData, prelude::*}; use sp_std::{marker::PhantomData, prelude::*};
/// A trait for querying whether a type can be said to "contain" a value. /// A trait for querying whether a type can be said to "contain" a value.
@@ -25,7 +26,9 @@ pub trait Contains<T> {
fn contains(t: &T) -> bool; fn contains(t: &T) -> bool;
} }
#[impl_trait_for_tuples::impl_for_tuples(1, 30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl<T> Contains<T> for Tuple { impl<T> Contains<T> for Tuple {
fn contains(t: &T) -> bool { fn contains(t: &T) -> bool {
for_tuples!( #( for_tuples!( #(
@@ -41,7 +44,9 @@ pub trait ContainsPair<A, B> {
fn contains(a: &A, b: &B) -> bool; fn contains(a: &A, b: &B) -> bool;
} }
#[impl_trait_for_tuples::impl_for_tuples(0, 30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl<A, B> ContainsPair<A, B> for Tuple { impl<A, B> ContainsPair<A, B> for Tuple {
fn contains(a: &A, b: &B) -> bool { fn contains(a: &A, b: &B) -> bool {
for_tuples!( #( for_tuples!( #(
substrate/frame/support/src/traits/metadata.rs
+13 -30
View File
@@ -18,6 +18,7 @@
//! Traits for managing information attached to pallets and their constituents. //! Traits for managing information attached to pallets and their constituents.
use codec::{Decode, Encode}; use codec::{Decode, Encode};
use impl_trait_for_tuples::impl_for_tuples;
use sp_runtime::RuntimeDebug; use sp_runtime::RuntimeDebug;
use sp_std::prelude::*; use sp_std::prelude::*;
@@ -70,40 +71,22 @@ pub trait PalletsInfoAccess {
/// ///
/// You probably don't want this function but `infos()` instead. /// You probably don't want this function but `infos()` instead.
fn count() -> usize { fn count() -> usize {
0 // for backwards compatibility with XCM-3, Mark is deprecated.
Self::infos().len()
} }
/// Extend the given vector by all of the pallets' information that this type represents.
///
/// You probably don't want this function but `infos()` instead.
fn accumulate(_accumulator: &mut Vec<PalletInfoData>) {}
/// All of the pallets' information that this type represents. /// All of the pallets' information that this type represents.
fn infos() -> Vec<PalletInfoData>;
}
#[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl PalletsInfoAccess for Tuple {
fn infos() -> Vec<PalletInfoData> { fn infos() -> Vec<PalletInfoData> {
let mut result = Vec::with_capacity(Self::count()); let mut res = vec![];
Self::accumulate(&mut result); for_tuples!( #( res.extend(Tuple::infos()); )* );
result res
}
}
impl PalletsInfoAccess for () {}
impl<T: PalletsInfoAccess> PalletsInfoAccess for (T,) {
fn count() -> usize {
T::count()
}
fn accumulate(acc: &mut Vec<PalletInfoData>) {
T::accumulate(acc)
}
}
impl<T1: PalletsInfoAccess, T2: PalletsInfoAccess> PalletsInfoAccess for (T1, T2) {
fn count() -> usize {
T1::count() + T2::count()
}
fn accumulate(acc: &mut Vec<PalletInfoData>) {
// The AllPallets type tuplises the pallets in reverse order, so we unreverse them here.
T2::accumulate(acc);
T1::accumulate(acc);
} }
} }
substrate/frame/support/src/traits/misc.rs
+10 -3
View File
@@ -19,6 +19,7 @@
use crate::dispatch::Parameter; use crate::dispatch::Parameter;
use codec::{CompactLen, Decode, DecodeLimit, Encode, EncodeLike, Input, MaxEncodedLen}; use codec::{CompactLen, Decode, DecodeLimit, Encode, EncodeLike, Input, MaxEncodedLen};
use impl_trait_for_tuples::impl_for_tuples;
use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter}; use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter};
use sp_arithmetic::traits::{CheckedAdd, CheckedMul, CheckedSub, Saturating}; use sp_arithmetic::traits::{CheckedAdd, CheckedMul, CheckedSub, Saturating};
#[doc(hidden)] #[doc(hidden)]
@@ -467,14 +468,18 @@ impl<A, B> SameOrOther<A, B> {
} }
/// Handler for when a new account has been created. /// Handler for when a new account has been created.
#[impl_trait_for_tuples::impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OnNewAccount<AccountId> { pub trait OnNewAccount<AccountId> {
/// A new account `who` has been registered. /// A new account `who` has been registered.
fn on_new_account(who: &AccountId); fn on_new_account(who: &AccountId);
} }
/// The account with the given id was reaped. /// The account with the given id was reaped.
#[impl_trait_for_tuples::impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OnKilledAccount<AccountId> { pub trait OnKilledAccount<AccountId> {
/// The account with the given id was reaped. /// The account with the given id was reaped.
fn on_killed_account(who: &AccountId); fn on_killed_account(who: &AccountId);
@@ -632,7 +637,9 @@ impl<Origin: PartialEq> PrivilegeCmp<Origin> for EqualPrivilegeOnly {
/// but cannot preform any alterations. More specifically alterations are /// but cannot preform any alterations. More specifically alterations are
/// not forbidden, but they are not persisted in any way after the worker /// not forbidden, but they are not persisted in any way after the worker
/// has finished. /// has finished.
#[impl_trait_for_tuples::impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
pub trait OffchainWorker<BlockNumber> { pub trait OffchainWorker<BlockNumber> {
/// This function is being called after every block import (when fully synced). /// This function is being called after every block import (when fully synced).
/// ///
substrate/frame/support/src/traits/storage.rs
+4 -1
View File
@@ -17,6 +17,7 @@
//! Traits for encoding data related to pallet's storage items. //! Traits for encoding data related to pallet's storage items.
use impl_trait_for_tuples::impl_for_tuples;
use sp_std::prelude::*; use sp_std::prelude::*;
/// An instance of a pallet in the storage. /// An instance of a pallet in the storage.
@@ -71,7 +72,9 @@ pub trait StorageInfoTrait {
fn storage_info() -> Vec<StorageInfo>; fn storage_info() -> Vec<StorageInfo>;
} }
#[impl_trait_for_tuples::impl_for_tuples(30)] #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
impl StorageInfoTrait for Tuple { impl StorageInfoTrait for Tuple {
fn storage_info() -> Vec<StorageInfo> { fn storage_info() -> Vec<StorageInfo> {
let mut res = vec![]; let mut res = vec![];
substrate/frame/support/test/tests/pallet.rs
+8 -5
View File
@@ -1597,8 +1597,9 @@ fn test_storage_info() {
#[test] #[test]
fn assert_type_all_pallets_reversed_with_system_first_is_correct() { fn assert_type_all_pallets_reversed_with_system_first_is_correct() {
// Just ensure the 2 types are same. // Just ensure the 2 types are same.
#[allow(deprecated)]
fn _a(_t: AllPalletsReversedWithSystemFirst) {} fn _a(_t: AllPalletsReversedWithSystemFirst) {}
fn _b(t: (System, (Example4, (Example2, (Example,))))) { fn _b(t: (System, Example4, Example2, Example)) {
_a(t) _a(t)
} }
} }
@@ -1607,7 +1608,7 @@ fn assert_type_all_pallets_reversed_with_system_first_is_correct() {
fn assert_type_all_pallets_with_system_is_correct() { fn assert_type_all_pallets_with_system_is_correct() {
// Just ensure the 2 types are same. // Just ensure the 2 types are same.
fn _a(_t: AllPalletsWithSystem) {} fn _a(_t: AllPalletsWithSystem) {}
fn _b(t: (System, (Example, (Example2, (Example4,))))) { fn _b(t: (System, Example, Example2, Example4)) {
_a(t) _a(t)
} }
} }
@@ -1616,7 +1617,7 @@ fn assert_type_all_pallets_with_system_is_correct() {
fn assert_type_all_pallets_without_system_is_correct() { fn assert_type_all_pallets_without_system_is_correct() {
// Just ensure the 2 types are same. // Just ensure the 2 types are same.
fn _a(_t: AllPalletsWithoutSystem) {} fn _a(_t: AllPalletsWithoutSystem) {}
fn _b(t: (Example, (Example2, (Example4,)))) { fn _b(t: (Example, Example2, Example4)) {
_a(t) _a(t)
} }
} }
@@ -1624,8 +1625,9 @@ fn assert_type_all_pallets_without_system_is_correct() {
#[test] #[test]
fn assert_type_all_pallets_with_system_reversed_is_correct() { fn assert_type_all_pallets_with_system_reversed_is_correct() {
// Just ensure the 2 types are same. // Just ensure the 2 types are same.
#[allow(deprecated)]
fn _a(_t: AllPalletsWithSystemReversed) {} fn _a(_t: AllPalletsWithSystemReversed) {}
fn _b(t: (Example4, (Example2, (Example, (System,))))) { fn _b(t: (Example4, Example2, Example, System)) {
_a(t) _a(t)
} }
} }
@@ -1633,8 +1635,9 @@ fn assert_type_all_pallets_with_system_reversed_is_correct() {
#[test] #[test]
fn assert_type_all_pallets_without_system_reversed_is_correct() { fn assert_type_all_pallets_without_system_reversed_is_correct() {
// Just ensure the 2 types are same. // Just ensure the 2 types are same.
#[allow(deprecated)]
fn _a(_t: AllPalletsWithoutSystemReversed) {} fn _a(_t: AllPalletsWithoutSystemReversed) {}
fn _b(t: (Example4, (Example2, (Example,)))) { fn _b(t: (Example4, Example2, Example)) {
_a(t) _a(t)
} }
} }
substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+3 -3
View File
@@ -1,13 +1,13 @@
error[E0107]: missing generics for trait `Hooks` error[E0107]: missing generics for trait `Hooks`
--> $DIR/hooks_invalid_item.rs:12:18 --> tests/pallet_ui/hooks_invalid_item.rs:12:18
| |
12 | impl<T: Config> Hooks for Pallet<T> {} 12 | impl<T: Config> Hooks for Pallet<T> {}
| ^^^^^ expected 1 generic argument | ^^^^^ expected 1 generic argument
| |
note: trait defined here, with 1 generic parameter: `BlockNumber` note: trait defined here, with 1 generic parameter: `BlockNumber`
--> $DIR/hooks.rs:214:11 --> $WORKSPACE/frame/support/src/traits/hooks.rs
| |
214 | pub trait Hooks<BlockNumber> { | pub trait Hooks<BlockNumber> {
| ^^^^^ ----------- | ^^^^^ -----------
help: add missing generic argument help: add missing generic argument
| |