Feature cleanup (#19528)

2021-08-31 14:51:26 -07:00
parent e1939688c2
commit 5cf8d8795b
7 changed files with 32 additions and 65 deletions
--- a/programs/stake/src/stake_instruction.rs
+++ b/programs/stake/src/stake_instruction.rs
@ -38,11 +38,7 @@ pub fn process_instruction(
    let me = &keyed_account_at_index(keyed_accounts, 0)?;

    if me.owner()? != id() {
-        if invoke_context.is_feature_active(&feature_set::check_program_owner::id()) {
-            return Err(InstructionError::InvalidAccountOwner);
-        } else {
-            return Err(InstructionError::IncorrectProgramId);
-        }
+        return Err(InstructionError::InvalidAccountOwner);
    }

    match limited_deserialize(data)? {