From 129b457c99552f563d1d34194ac50d179a1ba5c9 Mon Sep 17 00:00:00 2001 From: mvines Date: Fri, 9 Jun 2023 22:56:13 -0400 Subject: [PATCH] Remove StakeInstruction::DeactivateDelinquent featurization (#32045) --- programs/stake/src/stake_instruction.rs | 27 +++++++++---------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs index 0f2012ecb..ce1f67b29 100644 --- 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()?;