Fix miminal validators count when dealing with fisher (paritytech#716)

chainx-org · Jun 21, 2019 · 33af71a · 33af71a
1 parent 003deb0
commit 33af71a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/cli/src/chainx_runtime.compact.wasm b/cli/src/chainx_runtime.compact.wasm
diff --git a/runtime/wasm/target/wasm32-unknown-unknown/release/chainx_runtime.compact.wasm b/runtime/wasm/target/wasm32-unknown-unknown/release/chainx_runtime.compact.wasm
diff --git a/xrml/xmining/staking/src/shifter.rs b/xrml/xmining/staking/src/shifter.rs
@@ -195,7 +195,11 @@ impl<T: Trait> Module<T> {
 
         // Try removing the evil validators first.
         let evil_validators = <EvilValidatorsPerSession<T>>::take();
-        validators.retain(|x| !evil_validators.contains(x));
+        for evil_val in evil_validators.iter() {
+            if validators.len() > Self::minimum_validator_count() as usize {
+                validators.retain(|x| *x != *evil_val);
+            }
+        }
 
         // apply good session reward
         let mut session_reward = Self::this_session_reward();