blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stake: Cosmetic - rename variable

This commit is contained in:
Trent Nelson 2020-11-19 13:34:45 -07:00 committed by Trent Nelson
parent dc7f89715a
commit bb2772d068
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/stake/src/stake_state.rs
View File

@ -1046,12 +1046,12 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
fn merge( fn merge(
&self, &self,
source_stake: &KeyedAccount, source_account: &KeyedAccount,
clock: &Clock, clock: &Clock,
stake_history: &StakeHistory, stake_history: &StakeHistory,
signers: &HashSet<Pubkey>, signers: &HashSet<Pubkey>,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
if source_stake.owner()? != id() { if source_account.owner()? != id() {
return Err(InstructionError::IncorrectProgramId); return Err(InstructionError::IncorrectProgramId);
} }
@ -1060,7 +1060,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
// Authorized staker is allowed to split/merge accounts // Authorized staker is allowed to split/merge accounts
meta.authorized.check(signers, StakeAuthorize::Staker)?; meta.authorized.check(signers, StakeAuthorize::Staker)?;
let source_meta = get_info_if_mergable(source_stake, clock, stake_history)?; let source_meta = get_info_if_mergable(source_account, clock, stake_history)?;
// Meta must match for both accounts // Meta must match for both accounts
if meta != source_meta { if meta != source_meta {
@ -1068,8 +1068,8 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
} }
// Drain the source stake account // Drain the source stake account
let lamports = source_stake.lamports()?; let lamports = source_account.lamports()?;
source_stake.try_account_ref_mut()?.lamports -= lamports; source_account.try_account_ref_mut()?.lamports -= lamports;
self.try_account_ref_mut()?.lamports += lamports; self.try_account_ref_mut()?.lamports += lamports;
Ok(()) Ok(())
} }