Removes unnecessary borrows (#32498)
This commit is contained in:
parent
6246d817d7
commit
93d56c8eb2
|
@ -489,12 +489,7 @@ mod tests {
|
||||||
sysvar::{clock, rent, rewards, stake_history},
|
sysvar::{clock, rent, rewards, stake_history},
|
||||||
},
|
},
|
||||||
solana_vote_program::vote_state::{self, VoteState, VoteStateVersions},
|
solana_vote_program::vote_state::{self, VoteState, VoteStateVersions},
|
||||||
std::{
|
std::{collections::HashSet, str::FromStr, sync::Arc},
|
||||||
borrow::{Borrow, BorrowMut},
|
|
||||||
collections::HashSet,
|
|
||||||
str::FromStr,
|
|
||||||
sync::Arc,
|
|
||||||
},
|
|
||||||
test_case::test_case,
|
test_case::test_case,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -6486,7 +6481,6 @@ mod tests {
|
||||||
reference_vote_state.increment_credits(epoch as Epoch, 1);
|
reference_vote_state.increment_credits(epoch as Epoch, 1);
|
||||||
}
|
}
|
||||||
reference_vote_account
|
reference_vote_account
|
||||||
.borrow_mut()
|
|
||||||
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
@ -6517,7 +6511,6 @@ mod tests {
|
||||||
current_epoch - 1
|
current_epoch - 1
|
||||||
);
|
);
|
||||||
reference_vote_account
|
reference_vote_account
|
||||||
.borrow_mut()
|
|
||||||
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
@ -6536,7 +6529,6 @@ mod tests {
|
||||||
reference_vote_state.increment_credits(epoch, 1);
|
reference_vote_state.increment_credits(epoch, 1);
|
||||||
}
|
}
|
||||||
reference_vote_account
|
reference_vote_account
|
||||||
.borrow_mut()
|
|
||||||
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
.serialize_data(&VoteStateVersions::new_current(reference_vote_state))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
@ -6824,9 +6816,7 @@ mod tests {
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(output_accounts[0].lamports(), rent_exempt_reserve);
|
assert_eq!(output_accounts[0].lamports(), rent_exempt_reserve);
|
||||||
if let StakeState::Stake(meta, stake) =
|
if let StakeState::Stake(meta, stake) = output_accounts[0].deserialize_data().unwrap() {
|
||||||
output_accounts[0].borrow().deserialize_data().unwrap()
|
|
||||||
{
|
|
||||||
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
stake.delegation.stake,
|
stake.delegation.stake,
|
||||||
|
@ -6841,9 +6831,7 @@ mod tests {
|
||||||
output_accounts[1].lamports(),
|
output_accounts[1].lamports(),
|
||||||
minimum_delegation + rent_exempt_reserve
|
minimum_delegation + rent_exempt_reserve
|
||||||
);
|
);
|
||||||
if let StakeState::Stake(meta, stake) =
|
if let StakeState::Stake(meta, stake) = output_accounts[1].deserialize_data().unwrap() {
|
||||||
output_accounts[1].borrow().deserialize_data().unwrap()
|
|
||||||
{
|
|
||||||
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
||||||
assert_eq!(stake.delegation.stake, minimum_delegation);
|
assert_eq!(stake.delegation.stake, minimum_delegation);
|
||||||
assert_eq!(stake.delegation.activation_epoch, current_epoch);
|
assert_eq!(stake.delegation.activation_epoch, current_epoch);
|
||||||
|
@ -6986,9 +6974,7 @@ mod tests {
|
||||||
output_accounts[1].lamports(),
|
output_accounts[1].lamports(),
|
||||||
minimum_delegation + rent_exempt_reserve + 42
|
minimum_delegation + rent_exempt_reserve + 42
|
||||||
);
|
);
|
||||||
if let StakeState::Stake(meta, stake) =
|
if let StakeState::Stake(meta, stake) = output_accounts[1].deserialize_data().unwrap() {
|
||||||
output_accounts[1].borrow().deserialize_data().unwrap()
|
|
||||||
{
|
|
||||||
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
||||||
assert_eq!(stake.delegation.stake, minimum_delegation + 42);
|
assert_eq!(stake.delegation.stake, minimum_delegation + 42);
|
||||||
assert_eq!(stake.delegation.activation_epoch, current_epoch);
|
assert_eq!(stake.delegation.activation_epoch, current_epoch);
|
||||||
|
@ -7002,10 +6988,8 @@ mod tests {
|
||||||
//
|
//
|
||||||
let mut stake_account_over_allocated =
|
let mut stake_account_over_allocated =
|
||||||
prepare_stake_account(0 /*activation_epoch:*/, None);
|
prepare_stake_account(0 /*activation_epoch:*/, None);
|
||||||
if let StakeState::Stake(mut meta, stake) = stake_account_over_allocated
|
if let StakeState::Stake(mut meta, stake) =
|
||||||
.borrow_mut()
|
stake_account_over_allocated.deserialize_data().unwrap()
|
||||||
.deserialize_data()
|
|
||||||
.unwrap()
|
|
||||||
{
|
{
|
||||||
meta.rent_exempt_reserve += 42;
|
meta.rent_exempt_reserve += 42;
|
||||||
stake_account_over_allocated
|
stake_account_over_allocated
|
||||||
|
@ -7032,9 +7016,7 @@ mod tests {
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(output_accounts[0].lamports(), rent_exempt_reserve + 42);
|
assert_eq!(output_accounts[0].lamports(), rent_exempt_reserve + 42);
|
||||||
if let StakeState::Stake(meta, _stake) =
|
if let StakeState::Stake(meta, _stake) = output_accounts[0].deserialize_data().unwrap() {
|
||||||
output_accounts[0].borrow().deserialize_data().unwrap()
|
|
||||||
{
|
|
||||||
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve + 42);
|
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve + 42);
|
||||||
} else {
|
} else {
|
||||||
panic!("Invalid output_accounts[0] data");
|
panic!("Invalid output_accounts[0] data");
|
||||||
|
@ -7043,9 +7025,7 @@ mod tests {
|
||||||
output_accounts[1].lamports(),
|
output_accounts[1].lamports(),
|
||||||
minimum_delegation + rent_exempt_reserve,
|
minimum_delegation + rent_exempt_reserve,
|
||||||
);
|
);
|
||||||
if let StakeState::Stake(meta, stake) =
|
if let StakeState::Stake(meta, stake) = output_accounts[1].deserialize_data().unwrap() {
|
||||||
output_accounts[1].borrow().deserialize_data().unwrap()
|
|
||||||
{
|
|
||||||
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
assert_eq!(meta.rent_exempt_reserve, rent_exempt_reserve);
|
||||||
assert_eq!(stake.delegation.stake, minimum_delegation);
|
assert_eq!(stake.delegation.stake, minimum_delegation);
|
||||||
} else {
|
} else {
|
||||||
|
@ -7183,10 +7163,8 @@ mod tests {
|
||||||
|
|
||||||
let mut deactivating_stake_account =
|
let mut deactivating_stake_account =
|
||||||
prepare_stake_account(0 /*activation_epoch:*/, None);
|
prepare_stake_account(0 /*activation_epoch:*/, None);
|
||||||
if let StakeState::Stake(meta, mut stake) = deactivating_stake_account
|
if let StakeState::Stake(meta, mut stake) =
|
||||||
.borrow_mut()
|
deactivating_stake_account.deserialize_data().unwrap()
|
||||||
.deserialize_data()
|
|
||||||
.unwrap()
|
|
||||||
{
|
{
|
||||||
stake.deactivate(current_epoch).unwrap();
|
stake.deactivate(current_epoch).unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
@ -7220,10 +7198,8 @@ mod tests {
|
||||||
// (less than `minimum_delegation + rent_exempt_reserve`)
|
// (less than `minimum_delegation + rent_exempt_reserve`)
|
||||||
//
|
//
|
||||||
let mut stake_account_too_few_lamports = stake_account.clone();
|
let mut stake_account_too_few_lamports = stake_account.clone();
|
||||||
if let StakeState::Stake(meta, mut stake) = stake_account_too_few_lamports
|
if let StakeState::Stake(meta, mut stake) =
|
||||||
.borrow_mut()
|
stake_account_too_few_lamports.deserialize_data().unwrap()
|
||||||
.deserialize_data()
|
|
||||||
.unwrap()
|
|
||||||
{
|
{
|
||||||
stake.delegation.stake -= 1;
|
stake.delegation.stake -= 1;
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|
Loading…
Reference in New Issue