Companion of paritytech/substrate#10382, !

darwinia-network · Sep 8, 2022 · dec1844 · dec1844
1 parent 2d12161
commit dec1844
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 20 deletions.
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
@@ -24,8 +24,8 @@ use scale_info::TypeInfo;
 use frame_support::{
 	assert_err, assert_noop, assert_ok, assert_storage_noop, parameter_types,
 	traits::{
-		BalanceStatus, Currency, Everything, ExistenceRequirement, GenesisBuild, Imbalance,
-		LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
+		BalanceStatus, ConstU32, Currency, Everything, ExistenceRequirement, GenesisBuild,
+		Imbalance, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
 		StorageMapShim, WithdrawReasons,
 	},
 	weights::{DispatchInfo, IdentityFee, Weight},
@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = Balance;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
@@ -24,8 +24,8 @@ use scale_info::TypeInfo;
 use frame_support::{
 	assert_ok,
 	traits::{
-		BalanceStatus, Currency, Everything, GenesisBuild, OnUnbalanced, ReservableCurrency,
-		StorageMapShim,
+		BalanceStatus, ConstU32, Currency, Everything, GenesisBuild, OnUnbalanced,
+		ReservableCurrency, StorageMapShim,
 	},
 	weights::IdentityFee,
 };
@@ -65,6 +65,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/bridge/ecdsa-authority/src/mock.rs b/frame/bridge/ecdsa-authority/src/mock.rs
@@ -61,6 +61,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = Index;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/bridge/ethereum/src/mock.rs b/frame/bridge/ethereum/src/mock.rs
@@ -21,7 +21,7 @@
 // --- crates.io ---
 use codec::MaxEncodedLen;
 // --- paritytech ---
-use frame_support::traits::{Everything, OnInitialize};
+use frame_support::traits::{ConstU32, Everything, OnInitialize};
 use frame_system::{mocking::*, EnsureRoot};
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup, RuntimeDebug};
@@ -53,6 +53,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/bridge/relay-authority/src/mock.rs b/frame/bridge/relay-authority/src/mock.rs
@@ -22,7 +22,7 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 // --- paritytech ---
-use frame_support::traits::{Everything, GenesisBuild, OnFinalize, OnInitialize};
+use frame_support::traits::{ConstU32, Everything, GenesisBuild, OnFinalize, OnInitialize};
 use frame_system::{mocking::*, EnsureRoot};
 use sp_core::H256;
 use sp_io::{hashing, TestExternalities};
@@ -67,6 +67,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = Index;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/bridge/relayer-game/src/mock.rs b/frame/bridge/relayer-game/src/mock.rs
@@ -229,7 +229,7 @@ pub mod mock_relay {
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 // --- paritytech ---
-use frame_support::traits::{Everything, GenesisBuild, OnFinalize};
+use frame_support::traits::{ConstU32, Everything, GenesisBuild, OnFinalize};
 use frame_system::mocking::*;
 use sp_runtime::RuntimeDebug;
 // --- darwinia-network ---
@@ -264,6 +264,7 @@ impl frame_system::Config for Test {
 	type Header = sp_runtime::testing::Header;
 	type Index = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/dvm/ethereum/src/mock.rs b/frame/dvm/ethereum/src/mock.rs
@@ -27,7 +27,7 @@ use sha3::{Digest, Keccak256};
 // --- paritytech ---
 use fp_evm::{Context, FeeCalculator, Precompile, PrecompileResult, PrecompileSet};
 use frame_support::{
-	traits::{Everything, FindAuthor, GenesisBuild, OriginTrait, WithdrawReasons},
+	traits::{ConstU32, Everything, FindAuthor, GenesisBuild, OriginTrait, WithdrawReasons},
 	weights::GetDispatchInfo,
 	ConsensusEngineId, PalletId,
 };
@@ -80,6 +80,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/dvm/evm/precompiles/kton/src/mock.rs b/frame/dvm/evm/precompiles/kton/src/mock.rs
@@ -26,7 +26,7 @@ use fp_evm::{
 };
 use frame_support::{
 	pallet_prelude::Weight,
-	traits::{Everything, FindAuthor, GenesisBuild},
+	traits::{ConstU32, Everything, FindAuthor, GenesisBuild},
 	weights::GetDispatchInfo,
 	ConsensusEngineId, PalletId,
 };
@@ -84,6 +84,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/dvm/evm/precompiles/state-storage/src/tests.rs b/frame/dvm/evm/precompiles/state-storage/src/tests.rs
@@ -31,7 +31,7 @@ use fp_evm::{
 use frame_support::{
 	assert_ok,
 	pallet_prelude::Weight,
-	traits::{Everything, FindAuthor, GenesisBuild},
+	traits::{ConstU32, Everything, FindAuthor, GenesisBuild},
 	weights::GetDispatchInfo,
 	Blake2_128Concat, ConsensusEngineId, PalletId, StorageHasher, Twox128,
 };
@@ -89,6 +89,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/dvm/evm/src/tests.rs b/frame/dvm/evm/src/tests.rs
@@ -24,7 +24,7 @@ use scale_info::TypeInfo;
 // --- paritytech ---
 use frame_support::{
 	assert_ok,
-	traits::{Everything, GenesisBuild},
+	traits::{ConstU32, Everything, GenesisBuild},
 	ConsensusEngineId,
 };
 use frame_system::mocking::*;
@@ -65,6 +65,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/header-mmr/src/mock.rs b/frame/header-mmr/src/mock.rs
@@ -23,7 +23,7 @@ use codec::Encode;
 // --- github.com ---
 use mmr::MMRStore;
 // --- paritytech ---
-use frame_support::traits::{Everything, OnFinalize, OnInitialize};
+use frame_support::traits::{ConstU32, Everything, OnFinalize, OnInitialize};
 use frame_system::mocking::*;
 use sp_core::{
 	offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt},
@@ -60,6 +60,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
@@ -34,8 +34,8 @@ use frame_support::{
 	assert_ok, parameter_types,
 	storage::IterableStorageMap,
 	traits::{
-		Currency, Everything, FindAuthor, GenesisBuild, Get, Imbalance, OnFinalize, OnInitialize,
-		OnUnbalanced, OneSessionHandler, UnixTime,
+		ConstU32, Currency, Everything, FindAuthor, GenesisBuild, Get, Imbalance, OnFinalize,
+		OnInitialize, OnUnbalanced, OneSessionHandler, UnixTime,
 	},
 	weights::constants::RocksDbWeight,
 	PalletId, StorageValue,
@@ -135,6 +135,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = AccountIndex;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/transaction-pause/src/mock.rs b/frame/transaction-pause/src/mock.rs
@@ -21,7 +21,10 @@
 #![cfg(test)]
 
 use super::*;
-use frame_support::{construct_runtime, ord_parameter_types, parameter_types, traits::Everything};
+use frame_support::{
+	construct_runtime, ord_parameter_types, parameter_types,
+	traits::{ConstU32, Everything},
+};
 use frame_system::EnsureSignedBy;
 use scale_info::TypeInfo;
 use sp_core::H256;
@@ -57,6 +60,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/wormhole/backing/ethereum/src/mock.rs b/frame/wormhole/backing/ethereum/src/mock.rs
@@ -24,7 +24,7 @@ use scale_info::TypeInfo;
 // --- paritytech ---
 use frame_election_provider_support::onchain;
 use frame_support::{
-	traits::{Everything, GenesisBuild, SortedMembers},
+	traits::{ConstU32, Everything, GenesisBuild, SortedMembers},
 	PalletId,
 };
 use frame_system::{mocking::*, EnsureRoot};
@@ -76,6 +76,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/wormhole/backing/s2s/src/tests.rs b/frame/wormhole/backing/s2s/src/tests.rs
@@ -26,7 +26,10 @@ use scale_info::TypeInfo;
 use bp_messages::source_chain::SendMessageArtifacts;
 use bp_runtime::{derive_account_id, SourceAccount};
 use frame_support::{
-	assert_err, assert_ok, dispatch::PostDispatchInfo, traits::Everything, PalletId,
+	assert_err, assert_ok,
+	dispatch::PostDispatchInfo,
+	traits::{ConstU32, Everything},
+	PalletId,
 };
 use frame_system::{mocking::*, RawOrigin};
 use sp_runtime::{
@@ -90,6 +93,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/frame/wormhole/issuing/s2s/src/mock.rs b/frame/wormhole/issuing/s2s/src/mock.rs
@@ -25,7 +25,7 @@ use scale_info::TypeInfo;
 // --- paritytech ---
 use fp_evm::{Context, FeeCalculator, Precompile, PrecompileResult, PrecompileSet};
 use frame_support::{
-	traits::{Everything, GenesisBuild},
+	traits::{ConstU32, Everything, GenesisBuild},
 	weights::GetDispatchInfo,
 	PalletId,
 };
@@ -79,6 +79,7 @@ impl frame_system::Config for Test {
 	type Header = Header;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/node/runtime/common/src/gov_origin.rs b/node/runtime/common/src/gov_origin.rs
@@ -1,6 +1,6 @@
 // --- paritytech ---
-use frame_system::EnsureRoot;
 use frame_support::traits::EnsureOneOf;
+use frame_system::EnsureRoot;
 use pallet_collective::{EnsureProportionAtLeast, EnsureProportionMoreThan};
 use sp_core::u32_trait::{_1, _2, _3, _5};
 // --- darwinia-network ---

diff --git a/node/runtime/pangolin/src/lib.rs b/node/runtime/pangolin/src/lib.rs
@@ -91,7 +91,7 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type SignedBlock = generic::SignedBlock<Block>;
 /// The SignedExtension to the basic transaction logic.
 pub type SignedExtra = (
-	CheckNonZeroSender::<Runtime>,
+	CheckNonZeroSender<Runtime>,
 	CheckSpecVersion<Runtime>,
 	CheckTxVersion<Runtime>,
 	CheckGenesis<Runtime>,

diff --git a/node/runtime/pangolin/src/pallets/system.rs b/node/runtime/pangolin/src/pallets/system.rs
@@ -40,6 +40,7 @@ impl Config for Runtime {
 	type Header = Header;
 	type Index = Nonce;
 	type Lookup = DarwiniaAccountLookup;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/node/runtime/pangoro/src/pallets/system.rs b/node/runtime/pangoro/src/pallets/system.rs
@@ -40,6 +40,7 @@ impl Config for Runtime {
 	type Header = Header;
 	type Index = Nonce;
 	type Lookup = DarwiniaAccountLookup;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/node/runtime/template/src/pallets/mod.rs b/node/runtime/template/src/pallets/mod.rs
@@ -1,3 +1,6 @@
+pub mod shared_imports;
+pub use shared_imports::*;
+
 pub mod system;
 pub use system::*;
 

diff --git a/node/runtime/template/src/pallets/shared_imports.rs b/node/runtime/template/src/pallets/shared_imports.rs
@@ -0,0 +1 @@
+pub use frame_support::traits::ConstU32;
diff --git a/node/runtime/template/src/pallets/system.rs b/node/runtime/template/src/pallets/system.rs
@@ -26,6 +26,7 @@ impl Config for Runtime {
 	type Header = Header;
 	type Index = Nonce;
 	type Lookup = DarwiniaAccountLookup;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();