second pass on correctness, normalize style

Author: 2501babe

program/src/processor.rs

@@ -394,6 +394,7 @@ impl Processor {
             if Clock::check_id(branch_account.key) {
                 let _stake_history_info = next_account_info(account_info_iter)?;
                 let _stake_config_info = next_account_info(account_info_iter)?;
+                // let _stake_authority_info = next_account_info(account_info_iter);
             } else {
                 let stake_authority_info = branch_account;
                 if !stake_authority_info.is_signer {
@@ -746,7 +747,9 @@ impl Processor {
         // diverge
         {
             let branch_account = next_account_info(account_info_iter)?;
-            if !Clock::check_id(branch_account.key) {
+            if Clock::check_id(branch_account.key) {
+                // let _stake_authority_info = next_account_info(account_info_iter);
+            } else {
                 let stake_authority_info = branch_account;
                 if !stake_authority_info.is_signer {
                     return Err(ProgramError::MissingRequiredSignature);
@@ -807,6 +810,7 @@ impl Processor {
             let branch_account = next_account_info(account_info_iter)?;
             if Clock::check_id(branch_account.key) {
                 let _stake_history_info = next_account_info(account_info_iter)?;
+                // let _stake_authority_info = next_account_info(account_info_iter);
             } else {
                 let stake_authority_info = branch_account;
                 if !stake_authority_info.is_signer {
@@ -951,18 +955,17 @@ impl Processor {
         let stake_account_info = next_account_info(account_info_iter)?;
 
         // diverge
-        let _old_stake_or_withdraw_authority_info = {
+        {
             let branch_account = next_account_info(account_info_iter)?;
             if Clock::check_id(branch_account.key) {
-                next_account_info(account_info_iter)?
+                let _old_stake_or_withdraw_authority_info = next_account_info(account_info_iter)?;
             } else {
                 let old_stake_or_withdraw_authority_info = branch_account;
                 if !old_stake_or_withdraw_authority_info.is_signer {
                     return Err(ProgramError::MissingRequiredSignature);
                 }
-                old_stake_or_withdraw_authority_info
             }
-        };
+        }
 
         // converge
         let new_stake_or_withdraw_authority_info = next_account_info(account_info_iter)?;

program/tests/interface.rs

@@ -1033,6 +1033,8 @@ fn test_no_signer_bypass_new_interface() {
             .accounts
             .retain(|account| !is_stake_program_sysvar_or_config(account.pubkey));
 
+        let instruction = instruction;
+
         for i in 0..instruction.accounts.len() {
             if !instruction.accounts[i].is_signer {
                 continue;