From 44a10d73daae869a3c66777517e8823dbb0392b9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 9 Dec 2021 22:12:22 -0800 Subject: [PATCH] Update to Rust 1.57.0 --- ci/rust-version.sh | 4 +- governance/program/src/state/proposal.rs | 1 + stake-pool/program/src/big_vec.rs | 4 +- token-swap/program/fuzz/src/instructions.rs | 52 +++++------ .../program/fuzz/src/native_token_swap.rs | 12 +-- token-swap/program/src/processor.rs | 66 ++++++------- token/program-2022/src/processor.rs | 93 +++++++++---------- token/program/src/processor.rs | 93 +++++++++---------- 8 files changed, 160 insertions(+), 165 deletions(-) diff --git a/ci/rust-version.sh b/ci/rust-version.sh index e7284c6f1aa..6a48b0c1e07 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -18,13 +18,13 @@ if [[ -n $RUST_STABLE_VERSION ]]; then stable_version="$RUST_STABLE_VERSION" else - stable_version=1.54.0 + stable_version=1.57.0 fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2021-08-02 + nightly_version=2021-11-30 fi diff --git a/governance/program/src/state/proposal.rs b/governance/program/src/state/proposal.rs index 3ff68422378..0cbc1f6fa6b 100644 --- a/governance/program/src/state/proposal.rs +++ b/governance/program/src/state/proposal.rs @@ -1131,6 +1131,7 @@ mod test { #[derive(Clone, Debug)] pub struct VoteCastTestCase { + #[allow(dead_code)] name: &'static str, governing_token_supply: u64, vote_threshold_percentage: u8, diff --git a/stake-pool/program/src/big_vec.rs b/stake-pool/program/src/big_vec.rs index 385fb3f2f1d..b98a29ecb9f 100644 --- a/stake-pool/program/src/big_vec.rs +++ b/stake-pool/program/src/big_vec.rs @@ -120,8 +120,8 @@ impl<'data> BigVec<'data> { if self.data.len() < end_index { return Err(ProgramError::AccountDataTooSmall); } - let mut element_ref = &mut self.data[start_index..start_index + T::LEN]; - element.pack_into_slice(&mut element_ref); + let element_ref = &mut self.data[start_index..start_index + T::LEN]; + element.pack_into_slice(element_ref); Ok(()) } diff --git a/token-swap/program/fuzz/src/instructions.rs b/token-swap/program/fuzz/src/instructions.rs index 12134f25749..3a719c26b70 100644 --- a/token-swap/program/fuzz/src/instructions.rs +++ b/token-swap/program/fuzz/src/instructions.rs @@ -245,10 +245,10 @@ fn run_fuzz(fuzz_data: FuzzData) { // First, transfer all pool tokens to the fee account to avoid withdrawal // fees and a potential crash when withdrawing just 1 pool token. let mut fee_account = token_swap.pool_fee_account.clone(); - for mut pool_account in pool_accounts.values_mut() { + for pool_account in pool_accounts.values_mut() { let pool_token_amount = get_token_balance(pool_account); if pool_token_amount > 0 { - transfer(&mut pool_account, &mut fee_account, pool_token_amount); + transfer(pool_account, &mut fee_account, pool_token_amount); } } let mut pool_account = token_swap.pool_token_account.clone(); @@ -296,14 +296,14 @@ fn run_fuzz_instruction( trade_direction, instruction, } => { - let mut token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); - let mut token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); + let token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); + let token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); match trade_direction { TradeDirection::AtoB => { - token_swap.swap_a_to_b(&mut token_a_account, &mut token_b_account, instruction) + token_swap.swap_a_to_b(token_a_account, token_b_account, instruction) } TradeDirection::BtoA => { - token_swap.swap_b_to_a(&mut token_b_account, &mut token_a_account, instruction) + token_swap.swap_b_to_a(token_b_account, token_a_account, instruction) } } } @@ -313,13 +313,13 @@ fn run_fuzz_instruction( pool_token_id, instruction, } => { - let mut token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); - let mut token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); - let mut pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); + let token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); + let token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); + let pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); token_swap.deposit_all_token_types( - &mut token_a_account, - &mut token_b_account, - &mut pool_account, + token_a_account, + token_b_account, + pool_account, instruction, ) } @@ -329,13 +329,13 @@ fn run_fuzz_instruction( pool_token_id, instruction, } => { - let mut token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); - let mut token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); - let mut pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); + let token_a_account = token_a_accounts.get_mut(&token_a_id).unwrap(); + let token_b_account = token_b_accounts.get_mut(&token_b_id).unwrap(); + let pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); token_swap.withdraw_all_token_types( - &mut pool_account, - &mut token_a_account, - &mut token_b_account, + pool_account, + token_a_account, + token_b_account, instruction, ) } @@ -345,14 +345,14 @@ fn run_fuzz_instruction( pool_token_id, instruction, } => { - let mut source_token_account = match trade_direction { + let source_token_account = match trade_direction { TradeDirection::AtoB => token_a_accounts.get_mut(&token_account_id).unwrap(), TradeDirection::BtoA => token_b_accounts.get_mut(&token_account_id).unwrap(), }; - let mut pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); + let pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); token_swap.deposit_single_token_type_exact_amount_in( - &mut source_token_account, - &mut pool_account, + source_token_account, + pool_account, instruction, ) } @@ -362,14 +362,14 @@ fn run_fuzz_instruction( pool_token_id, instruction, } => { - let mut destination_token_account = match trade_direction { + let destination_token_account = match trade_direction { TradeDirection::AtoB => token_a_accounts.get_mut(&token_account_id).unwrap(), TradeDirection::BtoA => token_b_accounts.get_mut(&token_account_id).unwrap(), }; - let mut pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); + let pool_account = pool_accounts.get_mut(&pool_token_id).unwrap(); token_swap.withdraw_single_token_type_exact_amount_out( - &mut pool_account, - &mut destination_token_account, + pool_account, + destination_token_account, instruction, ) } diff --git a/token-swap/program/fuzz/src/native_token_swap.rs b/token-swap/program/fuzz/src/native_token_swap.rs index b340eb5b433..802c0cd03b2 100644 --- a/token-swap/program/fuzz/src/native_token_swap.rs +++ b/token-swap/program/fuzz/src/native_token_swap.rs @@ -547,9 +547,9 @@ impl NativeTokenSwap { pub fn withdraw_all( &mut self, - mut pool_account: &mut NativeAccountData, - mut token_a_account: &mut NativeAccountData, - mut token_b_account: &mut NativeAccountData, + pool_account: &mut NativeAccountData, + token_a_account: &mut NativeAccountData, + token_b_account: &mut NativeAccountData, ) -> ProgramResult { let pool_token_amount = native_token::get_token_balance(pool_account); if pool_token_amount > 0 { @@ -559,9 +559,9 @@ impl NativeTokenSwap { minimum_token_b_amount: 0, }; self.withdraw_all_token_types( - &mut pool_account, - &mut token_a_account, - &mut token_b_account, + pool_account, + token_a_account, + token_b_account, instruction, ) } else { diff --git a/token-swap/program/src/processor.rs b/token-swap/program/src/processor.rs index fdd32a50b2b..9ccf1c357a9 100644 --- a/token-swap/program/src/processor.rs +++ b/token-swap/program/src/processor.rs @@ -1417,11 +1417,11 @@ mod tests { &mut self, user_key: &Pubkey, user_source_key: &Pubkey, - mut user_source_account: &mut Account, + user_source_account: &mut Account, swap_source_key: &Pubkey, swap_destination_key: &Pubkey, user_destination_key: &Pubkey, - mut user_destination_account: &mut Account, + user_destination_account: &mut Account, amount_in: u64, minimum_amount_out: u64, ) -> ProgramResult { @@ -1438,7 +1438,7 @@ mod tests { ) .unwrap(), vec![ - &mut user_source_account, + user_source_account, &mut Account::default(), &mut Account::default(), ], @@ -1473,10 +1473,10 @@ mod tests { &mut self.swap_account, &mut Account::default(), &mut Account::default(), - &mut user_source_account, + user_source_account, &mut swap_source_account, &mut swap_destination_account, - &mut user_destination_account, + user_destination_account, &mut self.pool_mint_account, &mut self.pool_fee_account, &mut Account::default(), @@ -1494,11 +1494,11 @@ mod tests { &mut self, depositor_key: &Pubkey, depositor_token_a_key: &Pubkey, - mut depositor_token_a_account: &mut Account, + depositor_token_a_account: &mut Account, depositor_token_b_key: &Pubkey, - mut depositor_token_b_account: &mut Account, + depositor_token_b_account: &mut Account, depositor_pool_key: &Pubkey, - mut depositor_pool_account: &mut Account, + depositor_pool_account: &mut Account, pool_token_amount: u64, maximum_token_a_amount: u64, maximum_token_b_amount: u64, @@ -1515,7 +1515,7 @@ mod tests { ) .unwrap(), vec![ - &mut depositor_token_a_account, + depositor_token_a_account, &mut Account::default(), &mut Account::default(), ], @@ -1533,7 +1533,7 @@ mod tests { ) .unwrap(), vec![ - &mut depositor_token_b_account, + depositor_token_b_account, &mut Account::default(), &mut Account::default(), ], @@ -1564,12 +1564,12 @@ mod tests { &mut self.swap_account, &mut Account::default(), &mut Account::default(), - &mut depositor_token_a_account, - &mut depositor_token_b_account, + depositor_token_a_account, + depositor_token_b_account, &mut self.token_a_account, &mut self.token_b_account, &mut self.pool_mint_account, - &mut depositor_pool_account, + depositor_pool_account, &mut Account::default(), ], ) @@ -1580,11 +1580,11 @@ mod tests { &mut self, user_key: &Pubkey, pool_key: &Pubkey, - mut pool_account: &mut Account, + pool_account: &mut Account, token_a_key: &Pubkey, - mut token_a_account: &mut Account, + token_a_account: &mut Account, token_b_key: &Pubkey, - mut token_b_account: &mut Account, + token_b_account: &mut Account, pool_token_amount: u64, minimum_token_a_amount: u64, minimum_token_b_amount: u64, @@ -1602,7 +1602,7 @@ mod tests { ) .unwrap(), vec![ - &mut pool_account, + pool_account, &mut Account::default(), &mut Account::default(), ], @@ -1636,11 +1636,11 @@ mod tests { &mut Account::default(), &mut Account::default(), &mut self.pool_mint_account, - &mut pool_account, + pool_account, &mut self.token_a_account, &mut self.token_b_account, - &mut token_a_account, - &mut token_b_account, + token_a_account, + token_b_account, &mut self.pool_fee_account, &mut Account::default(), ], @@ -1652,9 +1652,9 @@ mod tests { &mut self, depositor_key: &Pubkey, deposit_account_key: &Pubkey, - mut deposit_token_account: &mut Account, + deposit_token_account: &mut Account, deposit_pool_key: &Pubkey, - mut deposit_pool_account: &mut Account, + deposit_pool_account: &mut Account, source_token_amount: u64, minimum_pool_token_amount: u64, ) -> ProgramResult { @@ -1670,7 +1670,7 @@ mod tests { ) .unwrap(), vec![ - &mut deposit_token_account, + deposit_token_account, &mut Account::default(), &mut Account::default(), ], @@ -1699,11 +1699,11 @@ mod tests { &mut self.swap_account, &mut Account::default(), &mut Account::default(), - &mut deposit_token_account, + deposit_token_account, &mut self.token_a_account, &mut self.token_b_account, &mut self.pool_mint_account, - &mut deposit_pool_account, + deposit_pool_account, &mut Account::default(), ], ) @@ -1714,9 +1714,9 @@ mod tests { &mut self, user_key: &Pubkey, pool_key: &Pubkey, - mut pool_account: &mut Account, + pool_account: &mut Account, destination_key: &Pubkey, - mut destination_account: &mut Account, + destination_account: &mut Account, destination_token_amount: u64, maximum_pool_token_amount: u64, ) -> ProgramResult { @@ -1733,7 +1733,7 @@ mod tests { ) .unwrap(), vec![ - &mut pool_account, + pool_account, &mut Account::default(), &mut Account::default(), ], @@ -1764,10 +1764,10 @@ mod tests { &mut Account::default(), &mut Account::default(), &mut self.pool_mint_account, - &mut pool_account, + pool_account, &mut self.token_a_account, &mut self.token_b_account, - &mut destination_account, + destination_account, &mut self.pool_fee_account, &mut Account::default(), ], @@ -1846,7 +1846,7 @@ mod tests { fn mint_token( program_id: &Pubkey, mint_key: &Pubkey, - mut mint_account: &mut Account, + mint_account: &mut Account, mint_authority_key: &Pubkey, account_owner_key: &Pubkey, amount: u64, @@ -1864,7 +1864,7 @@ mod tests { initialize_account(program_id, &account_key, mint_key, account_owner_key).unwrap(), vec![ &mut account_account, - &mut mint_account, + mint_account, &mut mint_authority_account, &mut rent_sysvar_account, ], @@ -1883,7 +1883,7 @@ mod tests { ) .unwrap(), vec![ - &mut mint_account, + mint_account, &mut account_account, &mut mint_authority_account, ], diff --git a/token/program-2022/src/processor.rs b/token/program-2022/src/processor.rs index a1d86f06e16..5ab0002634a 100644 --- a/token/program-2022/src/processor.rs +++ b/token/program-2022/src/processor.rs @@ -4370,7 +4370,7 @@ mod tests { vec![ &mut multisig_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) ); @@ -4385,7 +4385,7 @@ mod tests { vec![ &mut multisig_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4394,10 +4394,7 @@ mod tests { let account_info_iter = &mut signer_accounts.iter_mut(); do_process_instruction( initialize_multisig2(&program_id, &multisig_key, &[&signer_keys[0]], 1).unwrap(), - vec![ - &mut multisig_account2, - &mut account_info_iter.next().unwrap(), - ], + vec![&mut multisig_account2, account_info_iter.next().unwrap()], ) .unwrap(); @@ -4414,17 +4411,17 @@ mod tests { vec![ &mut multisig_delegate_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4482,7 +4479,7 @@ mod tests { &mut mint_account, &mut account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4503,7 +4500,7 @@ mod tests { &mut account, &mut multisig_delegate_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4524,7 +4521,7 @@ mod tests { &mut account, &mut account2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4545,17 +4542,17 @@ mod tests { &mut account, &mut account2_account, &mut multisig_delegate_account, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4576,7 +4573,7 @@ mod tests { &mut mint_account, &mut account2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4597,7 +4594,7 @@ mod tests { &mut account, &mut mint_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4618,17 +4615,17 @@ mod tests { &mut account, &mut mint_account, &mut multisig_delegate_account, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4680,7 +4677,7 @@ mod tests { &mut mint2_account, &mut account3_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4698,7 +4695,7 @@ mod tests { &mut account3_account, &mut mint2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4718,7 +4715,7 @@ mod tests { vec![ &mut mint_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4738,7 +4735,7 @@ mod tests { vec![ &mut account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); diff --git a/token/program/src/processor.rs b/token/program/src/processor.rs index a1d86f06e16..5ab0002634a 100644 --- a/token/program/src/processor.rs +++ b/token/program/src/processor.rs @@ -4370,7 +4370,7 @@ mod tests { vec![ &mut multisig_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) ); @@ -4385,7 +4385,7 @@ mod tests { vec![ &mut multisig_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4394,10 +4394,7 @@ mod tests { let account_info_iter = &mut signer_accounts.iter_mut(); do_process_instruction( initialize_multisig2(&program_id, &multisig_key, &[&signer_keys[0]], 1).unwrap(), - vec![ - &mut multisig_account2, - &mut account_info_iter.next().unwrap(), - ], + vec![&mut multisig_account2, account_info_iter.next().unwrap()], ) .unwrap(); @@ -4414,17 +4411,17 @@ mod tests { vec![ &mut multisig_delegate_account, &mut rent_sysvar, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4482,7 +4479,7 @@ mod tests { &mut mint_account, &mut account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4503,7 +4500,7 @@ mod tests { &mut account, &mut multisig_delegate_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4524,7 +4521,7 @@ mod tests { &mut account, &mut account2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4545,17 +4542,17 @@ mod tests { &mut account, &mut account2_account, &mut multisig_delegate_account, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4576,7 +4573,7 @@ mod tests { &mut mint_account, &mut account2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4597,7 +4594,7 @@ mod tests { &mut account, &mut mint_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4618,17 +4615,17 @@ mod tests { &mut account, &mut mint_account, &mut multisig_delegate_account, - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4680,7 +4677,7 @@ mod tests { &mut mint2_account, &mut account3_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4698,7 +4695,7 @@ mod tests { &mut account3_account, &mut mint2_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4718,7 +4715,7 @@ mod tests { vec![ &mut mint_account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap(); @@ -4738,7 +4735,7 @@ mod tests { vec![ &mut account, &mut multisig_account, - &mut account_info_iter.next().unwrap(), + account_info_iter.next().unwrap(), ], ) .unwrap();