From f9f8262303e3e3377bf51d16b7c7133ae1477ccd Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 10 Aug 2020 13:48:43 +0200
Subject: [PATCH] Remove minimum_validator_count stale const (#6864)
---
substrate/frame/staking/src/benchmarking.rs | 6 +-----
substrate/frame/staking/src/lib.rs | 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/substrate/frame/staking/src/benchmarking.rs b/substrate/frame/staking/src/benchmarking.rs
index d92cd871791..aab92ef4ce5 100644
--- a/substrate/frame/staking/src/benchmarking.rs
+++ b/substrate/frame/staking/src/benchmarking.rs
@@ -55,8 +55,6 @@ pub fn create_validator_with_nominators<T: Trait>(
let mut points_total = 0;
let mut points_individual = Vec::new();
- MinimumValidatorCount::put(0);
-
let (v_stash, v_controller) = create_stash_controller::<T>(0, 100)?;
let validator_prefs = ValidatorPrefs {
commission: Perbill::from_percent(50),
@@ -356,7 +354,7 @@ benchmarks! {
new_era {
let v in 1 .. 10;
let n in 1 .. 100;
- MinimumValidatorCount::put(0);
+
create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
let session_index = SessionIndex::one();
}: {
@@ -393,7 +391,6 @@ benchmarks! {
payout_all {
let v in 1 .. 10;
let n in 1 .. 100;
- MinimumValidatorCount::put(0);
create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
// Start a new Era
let new_validators = Staking::<T>::new_era(SessionIndex::one()).unwrap();
@@ -577,7 +574,6 @@ benchmarks! {
// number of nominator intent
let n in 1000 .. 2000;
- MinimumValidatorCount::put(0);
create_validators_with_nominators_for_era::<T>(v, n, MAX_NOMINATIONS, false, None)?;
// needed for the solution to be generates.
diff --git a/substrate/frame/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs
index 60943be82f1..3e89df78414 100644
--- a/substrate/frame/staking/src/lib.rs
+++ b/substrate/frame/staking/src/lib.rs
@@ -330,7 +330,6 @@ use sp_npos_elections::{
is_score_better, VotingLimit, SupportMap, VoteWeight,
};
-const DEFAULT_MINIMUM_VALIDATOR_COUNT: u32 = 4;
const STAKING_ID: LockIdentifier = *b"staking ";
pub const MAX_UNLOCKING_CHUNKS: usize = 32;
pub const MAX_NOMINATIONS: usize = <CompactAssignments as VotingLimit>::LIMIT;
@@ -1032,8 +1031,7 @@ decl_storage! {
pub ValidatorCount get(fn validator_count) config(): u32;
/// Minimum number of staking participants before emergency conditions are imposed.
- pub MinimumValidatorCount get(fn minimum_validator_count) config():
- u32 = DEFAULT_MINIMUM_VALIDATOR_COUNT;
+ pub MinimumValidatorCount get(fn minimum_validator_count) config(): u32;
/// Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
/// easy to initialize and the performance hit is minimal (we expect no more than four
--
GitLab