mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 09:57:56 +00:00
Replace parameter_types with ConstU32 &c. (#10402)
* remove parameter types and use const type
* remove parameter types and use const type
* Delete {
* Delete count,
* refractor for beefy, benchmarking, child bounties, and collective pallets
* refractor for pallet contracts
* refractor for elections
* refractor for more pallets
* fix CI issues
* fix CI issues
* fix CI issues
* fix CI issues
* remove warning to fix CI issue
* remove warning to fix CI issue
refractor for pallet preimage
* remove warning to fix CI issue
refractor for pallet proxy
* remove warning to fix CI issue
refractor for pallet recovery
refractor for pallet randomness-collective-flip
* remove warning to fix CI issue
refractor for pallet scored-pool
refractor for pallet scheduler
refractor for pallet session
* remove warning to fix CI issue
refractor for pallet society, support, system, timestamp, tips
* remove warning to fix CI issue
refractor for pallet transaction_payment, transaction_storage, treasury, uniques, utility
* remove warning to fix CI issue
* cargo +nightly fmt
* CI fix
* more param refractor on beefy-mmr
* refractor for beefy
* Update frame/babe/src/mock.rs
* Update frame/babe/src/mock.rs
* Update frame/bounties/src/tests.rs
* Update frame/tips/src/tests.rs
* Delete mock.rs
* Update frame/examples/basic/src/tests.rs
* Apply suggestions from code review
* Update frame/im-online/src/mock.rs
* Update frame/im-online/src/mock.rs
* Update frame/offences/benchmarking/src/mock.rs
* Update frame/session/benchmarking/src/mock.rs
* Update frame/support/test/tests/pallet_compatibility.rs
* Update frame/support/test/tests/pallet_compatibility_instance.rs
* Update frame/treasury/src/tests.rs
* Update test-utils/runtime/src/lib.rs
* some cleanup
* fmt
* remove unused
Co-authored-by: Damilare <dakinlose@teamapt.com>
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
This commit is contained in:
@@ -26,8 +26,8 @@ use codec::{Decode, Encode, MaxEncodedLen};
|
||||
use frame_support::{
|
||||
construct_runtime, parameter_types,
|
||||
traits::{
|
||||
ConstU128, ConstU32, Currency, EnsureOneOf, EqualPrivilegeOnly, Everything, Imbalance,
|
||||
InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing, OnUnbalanced,
|
||||
ConstU128, ConstU16, ConstU32, Currency, EnsureOneOf, EqualPrivilegeOnly, Everything,
|
||||
Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing, OnUnbalanced,
|
||||
U128CurrencyToVote,
|
||||
},
|
||||
weights::{
|
||||
@@ -191,7 +191,6 @@ parameter_types! {
|
||||
})
|
||||
.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
|
||||
.build_or_panic();
|
||||
pub const SS58Prefix: u16 = 42;
|
||||
}
|
||||
|
||||
const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
|
||||
@@ -218,7 +217,7 @@ impl frame_system::Config for Runtime {
|
||||
type OnNewAccount = ();
|
||||
type OnKilledAccount = ();
|
||||
type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
|
||||
type SS58Prefix = SS58Prefix;
|
||||
type SS58Prefix = ConstU16<42>;
|
||||
type OnSetCode = ();
|
||||
type MaxConsumers = frame_support::traits::ConstU32<16>;
|
||||
}
|
||||
@@ -237,7 +236,6 @@ parameter_types! {
|
||||
pub const DepositBase: Balance = deposit(1, 88);
|
||||
// Additional storage item size of 32 bytes.
|
||||
pub const DepositFactor: Balance = deposit(0, 32);
|
||||
pub const MaxSignatories: u16 = 100;
|
||||
}
|
||||
|
||||
impl pallet_multisig::Config for Runtime {
|
||||
@@ -246,7 +244,7 @@ impl pallet_multisig::Config for Runtime {
|
||||
type Currency = Balances;
|
||||
type DepositBase = DepositBase;
|
||||
type DepositFactor = DepositFactor;
|
||||
type MaxSignatories = MaxSignatories;
|
||||
type MaxSignatories = ConstU16<100>;
|
||||
type WeightInfo = pallet_multisig::weights::SubstrateWeight<Runtime>;
|
||||
}
|
||||
|
||||
@@ -255,10 +253,8 @@ parameter_types! {
|
||||
pub const ProxyDepositBase: Balance = deposit(1, 8);
|
||||
// Additional storage item size of 33 bytes.
|
||||
pub const ProxyDepositFactor: Balance = deposit(0, 33);
|
||||
pub const MaxProxies: u16 = 32;
|
||||
pub const AnnouncementDepositBase: Balance = deposit(1, 8);
|
||||
pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
|
||||
pub const MaxPending: u16 = 32;
|
||||
}
|
||||
|
||||
/// The type used to represent the kinds of proxying allowed.
|
||||
@@ -325,9 +321,9 @@ impl pallet_proxy::Config for Runtime {
|
||||
type ProxyType = ProxyType;
|
||||
type ProxyDepositBase = ProxyDepositBase;
|
||||
type ProxyDepositFactor = ProxyDepositFactor;
|
||||
type MaxProxies = MaxProxies;
|
||||
type MaxProxies = ConstU32<32>;
|
||||
type WeightInfo = pallet_proxy::weights::SubstrateWeight<Runtime>;
|
||||
type MaxPending = MaxPending;
|
||||
type MaxPending = ConstU32<32>;
|
||||
type CallHasher = BlakeTwo256;
|
||||
type AnnouncementDepositBase = AnnouncementDepositBase;
|
||||
type AnnouncementDepositFactor = AnnouncementDepositFactor;
|
||||
@@ -336,7 +332,6 @@ impl pallet_proxy::Config for Runtime {
|
||||
parameter_types! {
|
||||
pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) *
|
||||
RuntimeBlockWeights::get().max_block;
|
||||
pub const MaxScheduledPerBlock: u32 = 50;
|
||||
// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
|
||||
pub const NoPreimagePostponement: Option<u32> = Some(10);
|
||||
}
|
||||
@@ -348,7 +343,7 @@ impl pallet_scheduler::Config for Runtime {
|
||||
type Call = Call;
|
||||
type MaximumWeight = MaximumSchedulerWeight;
|
||||
type ScheduleOrigin = EnsureRoot<AccountId>;
|
||||
type MaxScheduledPerBlock = MaxScheduledPerBlock;
|
||||
type MaxScheduledPerBlock = ConstU32<50>;
|
||||
type WeightInfo = pallet_scheduler::weights::SubstrateWeight<Runtime>;
|
||||
type OriginPrivilegeCmp = EqualPrivilegeOnly;
|
||||
type PreimageProvider = Preimage;
|
||||
@@ -581,7 +576,6 @@ parameter_types! {
|
||||
pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
|
||||
|
||||
// signed config
|
||||
pub const SignedMaxSubmissions: u32 = 10;
|
||||
pub const SignedRewardBase: Balance = 1 * DOLLARS;
|
||||
pub const SignedDepositBase: Balance = 1 * DOLLARS;
|
||||
pub const SignedDepositByte: Balance = 1 * CENTS;
|
||||
@@ -599,11 +593,6 @@ parameter_types! {
|
||||
*RuntimeBlockLength::get()
|
||||
.max
|
||||
.get(DispatchClass::Normal);
|
||||
|
||||
// BagsList allows a practically unbounded count of nominators to participate in NPoS elections.
|
||||
// To ensure we respect memory limits when using the BagsList this must be set to a number of
|
||||
// voters we know can fit into a single vec allocation.
|
||||
pub const VoterSnapshotPerBlock: u32 = 10_000;
|
||||
}
|
||||
|
||||
sp_npos_elections::generate_solution_type!(
|
||||
@@ -668,7 +657,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
|
||||
type MinerMaxWeight = MinerMaxWeight;
|
||||
type MinerMaxLength = MinerMaxLength;
|
||||
type MinerTxPriority = MultiPhaseUnsignedPriority;
|
||||
type SignedMaxSubmissions = SignedMaxSubmissions;
|
||||
type SignedMaxSubmissions = ConstU32<10>;
|
||||
type SignedRewardBase = SignedRewardBase;
|
||||
type SignedDepositBase = SignedDepositBase;
|
||||
type SignedDepositByte = SignedDepositByte;
|
||||
@@ -687,7 +676,10 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
|
||||
type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight<Self>;
|
||||
type ForceOrigin = EnsureRootOrHalfCouncil;
|
||||
type BenchmarkingConfig = ElectionProviderBenchmarkConfig;
|
||||
type VoterSnapshotPerBlock = VoterSnapshotPerBlock;
|
||||
// BagsList allows a practically unbounded count of nominators to participate in NPoS elections.
|
||||
// To ensure we respect memory limits when using the BagsList this must be set to a number of
|
||||
// voters we know can fit into a single vec allocation.
|
||||
type VoterSnapshotPerBlock = ConstU32<10_000>;
|
||||
}
|
||||
|
||||
parameter_types! {
|
||||
@@ -705,11 +697,9 @@ parameter_types! {
|
||||
pub const LaunchPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
|
||||
pub const VotingPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
|
||||
pub const FastTrackVotingPeriod: BlockNumber = 3 * 24 * 60 * MINUTES;
|
||||
pub const InstantAllowed: bool = true;
|
||||
pub const MinimumDeposit: Balance = 100 * DOLLARS;
|
||||
pub const EnactmentPeriod: BlockNumber = 30 * 24 * 60 * MINUTES;
|
||||
pub const CooloffPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
|
||||
pub const MaxVotes: u32 = 100;
|
||||
pub const MaxProposals: u32 = 100;
|
||||
}
|
||||
|
||||
@@ -738,7 +728,7 @@ impl pallet_democracy::Config for Runtime {
|
||||
pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCollective>;
|
||||
type InstantOrigin =
|
||||
pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>;
|
||||
type InstantAllowed = InstantAllowed;
|
||||
type InstantAllowed = frame_support::traits::ConstBool<true>;
|
||||
type FastTrackVotingPeriod = FastTrackVotingPeriod;
|
||||
// To cancel a proposal which has been passed, 2/3 of the council must agree to it.
|
||||
type CancellationOrigin =
|
||||
@@ -759,7 +749,7 @@ impl pallet_democracy::Config for Runtime {
|
||||
type Slash = Treasury;
|
||||
type Scheduler = Scheduler;
|
||||
type PalletsOrigin = OriginCaller;
|
||||
type MaxVotes = MaxVotes;
|
||||
type MaxVotes = frame_support::traits::ConstU32<100>;
|
||||
type WeightInfo = pallet_democracy::weights::SubstrateWeight<Runtime>;
|
||||
type MaxProposals = MaxProposals;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user