From 78207ddee8f0aace0cd23233f8d5a02963381f36 Mon Sep 17 00:00:00 2001 From: Agus Date: Tue, 25 Apr 2023 16:33:00 -0300 Subject: [PATCH] remove MinCollatorStk --- pallets/parachain-staking/src/benchmarks.rs | 2 +- pallets/parachain-staking/src/lib.rs | 5 ----- pallets/parachain-staking/src/mock.rs | 5 ++--- precompiles/parachain-staking/src/mock.rs | 5 ++--- runtime/moonbase/src/lib.rs | 6 ------ runtime/moonbeam/src/lib.rs | 6 ------ runtime/moonriver/src/lib.rs | 6 ------ 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/pallets/parachain-staking/src/benchmarks.rs b/pallets/parachain-staking/src/benchmarks.rs index 5e7425f55b..78563dd257 100644 --- a/pallets/parachain-staking/src/benchmarks.rs +++ b/pallets/parachain-staking/src/benchmarks.rs @@ -30,7 +30,7 @@ use sp_std::vec::Vec; /// Minimum collator candidate stake fn min_candidate_stk() -> BalanceOf { - <::MinCollatorStk as Get>>::get() + <::MinCandidateStk as Get>>::get() } /// Minimum delegator stake diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs index 71648616f7..acb0f75945 100644 --- a/pallets/parachain-staking/src/lib.rs +++ b/pallets/parachain-staking/src/lib.rs @@ -151,9 +151,6 @@ pub mod pallet { /// Maximum delegations per delegator #[pallet::constant] type MaxDelegationsPerDelegator: Get; - /// Minimum stake required for any candidate to be in `SelectedCandidates` for the round - #[pallet::constant] - type MinCollatorStk: Get>; /// Minimum stake required for any account to be a collator candidate #[pallet::constant] type MinCandidateStk: Get>; @@ -1744,7 +1741,6 @@ pub mod pallet { let mut collators = candidates .into_iter() .take(top_n) - .filter(|x| x.amount >= T::MinCollatorStk::get()) .map(|x| x.owner) .collect::>(); @@ -1757,7 +1753,6 @@ pub mod pallet { // The candidates are already sorted by AccountId, so no need to sort again candidates .into_iter() - .filter(|x| x.amount >= T::MinCollatorStk::get()) .map(|x| x.owner) .collect::>() } diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs index 7d4659c0d7..cfee758433 100644 --- a/pallets/parachain-staking/src/mock.rs +++ b/pallets/parachain-staking/src/mock.rs @@ -117,7 +117,7 @@ parameter_types! { pub const MaxTopDelegationsPerCandidate: u32 = 4; pub const MaxBottomDelegationsPerCandidate: u32 = 4; pub const MaxDelegationsPerDelegator: u32 = 4; - pub const MinCollatorStk: u128 = 10; + pub const MinCandidateStk: u128 = 10; pub const MinDelegatorStk: u128 = 5; pub const MinDelegation: u128 = 3; } @@ -136,8 +136,7 @@ impl Config for Test { type MaxTopDelegationsPerCandidate = MaxTopDelegationsPerCandidate; type MaxBottomDelegationsPerCandidate = MaxBottomDelegationsPerCandidate; type MaxDelegationsPerDelegator = MaxDelegationsPerDelegator; - type MinCollatorStk = MinCollatorStk; - type MinCandidateStk = MinCollatorStk; + type MinCandidateStk = MinCandidateStk; type MinDelegatorStk = MinDelegatorStk; type MinDelegation = MinDelegation; type BlockAuthor = BlockAuthor; diff --git a/precompiles/parachain-staking/src/mock.rs b/precompiles/parachain-staking/src/mock.rs index 9a5440c9c1..28f2e2d982 100644 --- a/precompiles/parachain-staking/src/mock.rs +++ b/precompiles/parachain-staking/src/mock.rs @@ -160,7 +160,7 @@ parameter_types! { pub const MaxTopDelegationsPerCandidate: u32 = 2; pub const MaxBottomDelegationsPerCandidate: u32 = 4; pub const MaxDelegationsPerDelegator: u32 = 4; - pub const MinCollatorStk: u128 = 10; + pub const MinCandidateStk: u128 = 10; pub const MinDelegatorStk: u128 = 5; pub const MinDelegation: u128 = 3; pub BlockAuthor: AccountId = Alice.into(); @@ -180,8 +180,7 @@ impl pallet_parachain_staking::Config for Runtime { type MaxTopDelegationsPerCandidate = MaxTopDelegationsPerCandidate; type MaxBottomDelegationsPerCandidate = MaxBottomDelegationsPerCandidate; type MaxDelegationsPerDelegator = MaxDelegationsPerDelegator; - type MinCollatorStk = MinCollatorStk; - type MinCandidateStk = MinCollatorStk; + type MinCandidateStk = MinCandidateStk; type MinDelegatorStk = MinDelegatorStk; type MinDelegation = MinDelegation; type BlockAuthor = BlockAuthor; diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 8557aeecde..ecfcebf86d 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -707,8 +707,6 @@ impl pallet_parachain_staking::Config for Runtime { type MaxBottomDelegationsPerCandidate = ConstU32<50>; /// Maximum delegations per delegator type MaxDelegationsPerDelegator = ConstU32<100>; - /// Minimum stake required to become a collator - type MinCollatorStk = ConstU128<{ 1000 * currency::UNIT * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a candidate type MinCandidateStk = ConstU128<{ 500 * currency::UNIT * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a delegator @@ -1568,10 +1566,6 @@ mod tests { ); // staking minimums - assert_eq!( - get!(pallet_parachain_staking, MinCollatorStk, u128), - Balance::from(1 * KILOUNIT) - ); assert_eq!( get!(pallet_parachain_staking, MinCandidateStk, u128), Balance::from(500 * UNIT) diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index a19d5431cf..ce12a808be 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -765,8 +765,6 @@ impl pallet_parachain_staking::Config for Runtime { type MaxBottomDelegationsPerCandidate = ConstU32<50>; /// Maximum delegations per delegator type MaxDelegationsPerDelegator = ConstU32<100>; - /// Minimum stake required to become a collator - type MinCollatorStk = ConstU128<{ 20_000 * currency::GLMR * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a candidate type MinCandidateStk = ConstU128<{ 20_000 * currency::GLMR * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a delegator @@ -1636,10 +1634,6 @@ mod tests { ); // staking minimums - assert_eq!( - get!(pallet_parachain_staking, MinCollatorStk, u128), - Balance::from(2_000_000 * GLMR) - ); assert_eq!( get!(pallet_parachain_staking, MinCandidateStk, u128), Balance::from(2_000_000 * GLMR) diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 701e1b7055..f5e11c1b64 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -670,8 +670,6 @@ impl pallet_parachain_staking::Config for Runtime { type MaxBottomDelegationsPerCandidate = ConstU32<50>; /// Maximum delegations per delegator type MaxDelegationsPerDelegator = ConstU32<100>; - /// Minimum stake required to become a collator - type MinCollatorStk = ConstU128<{ 10000 * currency::MOVR * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a candidate type MinCandidateStk = ConstU128<{ 10000 * currency::MOVR * currency::SUPPLY_FACTOR }>; /// Minimum stake required to be reserved to be a delegator @@ -1564,10 +1562,6 @@ mod tests { ); // staking minimums - assert_eq!( - get!(pallet_parachain_staking, MinCollatorStk, u128), - Balance::from(10 * KILOMOVR) - ); assert_eq!( get!(pallet_parachain_staking, MinCandidateStk, u128), Balance::from(10 * KILOMOVR)