Remove StakeInstruction::DeactivateDelinquent featurization (solana-l…

…abs#32045)
takeuchi5512 · Jun 10, 2023 · 129b457 · 129b457
1 parent 450e7c2
commit 129b457
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs
@@ -425,24 +425,17 @@ declare_process_instruction!(
             }
             Ok(StakeInstruction::DeactivateDelinquent) => {
                 let mut me = get_stake_account()?;
-                if invoke_context
-                    .feature_set
-                    .is_active(&feature_set::stake_deactivate_delinquent_instruction::id())
-                {
-                    instruction_context.check_number_of_instruction_accounts(3)?;
+                instruction_context.check_number_of_instruction_accounts(3)?;
 
-                    let clock = invoke_context.get_sysvar_cache().get_clock()?;
-                    deactivate_delinquent(
-                        transaction_context,
-                        instruction_context,
-                        &mut me,
-                        1,
-                        2,
-                        clock.epoch,
-                    )
-                } else {
-                    Err(InstructionError::InvalidInstructionData)
-                }
+                let clock = invoke_context.get_sysvar_cache().get_clock()?;
+                deactivate_delinquent(
+                    transaction_context,
+                    instruction_context,
+                    &mut me,
+                    1,
+                    2,
+                    clock.epoch,
+                )
             }
             Ok(StakeInstruction::Redelegate) => {
                 let mut me = get_stake_account()?;