revert threshold

chain/chain/src/runtime/mod.rs

@@ -1313,8 +1313,6 @@ impl RuntimeAdapter for NightshadeRuntime {
             epoch_config.block_producer_kickout_threshold;
         genesis_config.chunk_producer_kickout_threshold =
             epoch_config.chunk_producer_kickout_threshold;
-        genesis_config.chunk_validator_only_kickout_threshold =
-            epoch_config.chunk_validator_only_kickout_threshold;
         genesis_config.max_kickout_stake_perc = epoch_config.validator_max_kickout_stake_perc;
         genesis_config.online_min_threshold = epoch_config.online_min_threshold;
         genesis_config.online_max_threshold = epoch_config.online_max_threshold;

chain/chain/src/runtime/tests.rs

@@ -206,8 +206,6 @@ impl TestEnv {
         genesis.config.epoch_length = config.epoch_length;
         genesis.config.chunk_producer_kickout_threshold =
             genesis.config.block_producer_kickout_threshold;
-        genesis.config.chunk_validator_only_kickout_threshold =
-            genesis.config.block_producer_kickout_threshold;
         if !config.has_reward {
             genesis.config.max_inflation_rate = Ratio::from_integer(0);
         }

chain/chain/src/test_utils/kv_runtime.rs

@@ -486,7 +486,6 @@ impl EpochManagerAdapter for MockEpochManager {
             avg_hidden_validator_seats_per_shard: vec![1, 1],
             block_producer_kickout_threshold: 0,
             chunk_producer_kickout_threshold: 0,
-            chunk_validator_only_kickout_threshold: 0,
             validator_max_kickout_stake_perc: 0,
             online_min_threshold: Ratio::new(1i32, 4i32),
             online_max_threshold: Ratio::new(3i32, 4i32),

chain/client/src/info.rs

@@ -1031,7 +1031,6 @@ mod tests {
             num_block_producer_seats.try_into().unwrap(),
             90,
             90,
-            0,
             default_reward_calculator(),
         )
         .into_handle();

chain/epoch-manager/src/lib.rs

@@ -481,7 +481,6 @@ impl EpochManager {
     {
         let block_producer_kickout_threshold = config.block_producer_kickout_threshold;
         let chunk_producer_kickout_threshold = config.chunk_producer_kickout_threshold;
-        let chunk_validator_only_kickout_threshold = config.chunk_validator_only_kickout_threshold;
         let mut validator_block_chunk_stats = HashMap::new();
         let mut total_stake: Balance = 0;
         let mut maximum_block_prod = 0;
@@ -552,21 +551,6 @@ impl EpochManager {
                     }
                 });
             }
-            let chunk_validator_only =
-                stats.block_stats.expected == 0 && stats.chunk_stats.expected() == 0;
-            if chunk_validator_only
-                && stats
-                    .chunk_stats
-                    .endorsement_stats()
-                    .less_than(chunk_validator_only_kickout_threshold)
-            {
-                validator_kickout.entry(account_id.clone()).or_insert_with(|| {
-                    ValidatorKickoutReason::NotEnoughChunkEndorsements {
-                        produced: stats.chunk_stats.endorsement_stats().produced,
-                        expected: stats.chunk_stats.endorsement_stats().expected,
-                    }
-                });
-            }
             let is_already_kicked_out = prev_validator_kickout.contains_key(account_id);
             if !validator_kickout.contains_key(account_id) {
                 if !is_already_kicked_out {
@@ -738,7 +722,6 @@ impl EpochManager {
                     reason,
                     ValidatorKickoutReason::NotEnoughBlocks { .. }
                         | ValidatorKickoutReason::NotEnoughChunks { .. }
-                        | ValidatorKickoutReason::NotEnoughChunkEndorsements { .. }
                 ) {
                     validator_block_chunk_stats.remove(account_id);
                 }

chain/epoch-manager/src/shard_tracker.rs

@@ -229,7 +229,6 @@ mod tests {
             avg_hidden_validator_seats_per_shard: vec![],
             block_producer_kickout_threshold: 90,
             chunk_producer_kickout_threshold: 60,
-            chunk_validator_only_kickout_threshold: 60,
             fishermen_threshold: 0,
             online_max_threshold: Ratio::from_integer(1),
             online_min_threshold: Ratio::new(90, 100),

chain/epoch-manager/src/test_utils.rs

@@ -127,7 +127,6 @@ pub fn epoch_config_with_production_config(
     num_chunk_producer_seats: NumSeats,
     block_producer_kickout_threshold: u8,
     chunk_producer_kickout_threshold: u8,
-    chunk_validator_only_kickout_threshold: u8,
     use_production_config: bool,
 ) -> AllEpochConfig {
     let epoch_config = EpochConfig {
@@ -140,7 +139,6 @@ pub fn epoch_config_with_production_config(
         avg_hidden_validator_seats_per_shard: vec![],
         block_producer_kickout_threshold,
         chunk_producer_kickout_threshold,
-        chunk_validator_only_kickout_threshold,
         fishermen_threshold: 0,
         online_min_threshold: Ratio::new(90, 100),
         online_max_threshold: Ratio::new(99, 100),
@@ -162,7 +160,6 @@ pub fn epoch_config(
     num_block_producer_seats: NumSeats,
     block_producer_kickout_threshold: u8,
     chunk_producer_kickout_threshold: u8,
-    chunk_validator_only_kickout_threshold: u8,
 ) -> AllEpochConfig {
     epoch_config_with_production_config(
         epoch_length,
@@ -171,7 +168,6 @@ pub fn epoch_config(
         100,
         block_producer_kickout_threshold,
         chunk_producer_kickout_threshold,
-        chunk_validator_only_kickout_threshold,
         false,
     )
 }
@@ -206,7 +202,6 @@ pub fn setup_epoch_manager(
     num_block_producer_seats: NumSeats,
     block_producer_kickout_threshold: u8,
     chunk_producer_kickout_threshold: u8,
-    chunk_validator_only_kickout_threshold: u8,
     reward_calculator: RewardCalculator,
 ) -> EpochManager {
     let store = create_test_store();
@@ -216,7 +211,6 @@ pub fn setup_epoch_manager(
         num_block_producer_seats,
         block_producer_kickout_threshold,
         chunk_producer_kickout_threshold,
-        chunk_validator_only_kickout_threshold,
     );
     EpochManager::new(
         store,
@@ -246,7 +240,6 @@ pub fn setup_default_epoch_manager(
         num_block_producer_seats,
         block_producer_kickout_threshold,
         chunk_producer_kickout_threshold,
-        0,
         default_reward_calculator(),
     )
 }
@@ -280,7 +273,7 @@ pub fn setup_epoch_manager_with_block_and_chunk_producers(
         validators.push((chunk_only_producer.clone(), stake));
         total_stake += stake;
     }
-    let config = epoch_config(epoch_length, num_shards, num_block_producers, 0, 0, 0);
+    let config = epoch_config(epoch_length, num_shards, num_block_producers, 0, 0);
     let epoch_manager = EpochManager::new(
         store,
         config,