Skip to content

Commit

Permalink
minor VoteAccount refactoring (#23686)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffwashington authored Mar 16, 2022
1 parent cffc32a commit fa79265
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions runtime/src/vote_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use {
ser::{Serialize, Serializer},
},
solana_sdk::{
account::{Account, AccountSharedData},
account::{Account, AccountSharedData, ReadableAccount},
instruction::InstructionError,
pubkey::Pubkey,
},
Expand Down Expand Up @@ -57,13 +57,13 @@ impl VoteAccount {
}

pub(crate) fn lamports(&self) -> u64 {
self.account().lamports
self.account().lamports()
}

pub fn vote_state(&self) -> RwLockReadGuard<Result<VoteState, InstructionError>> {
let inner = &self.0;
inner.vote_state_once.call_once(|| {
let vote_state = VoteState::deserialize(&inner.account.data);
let vote_state = VoteState::deserialize(inner.account.data());
*inner.vote_state.write().unwrap() = vote_state;
});
inner.vote_state.read().unwrap()
Expand Down Expand Up @@ -405,7 +405,7 @@ mod tests {
fn test_vote_account() {
let mut rng = rand::thread_rng();
let (account, vote_state) = new_rand_vote_account(&mut rng, None);
let lamports = account.lamports;
let lamports = account.lamports();
let vote_account = VoteAccount::from(account);
assert_eq!(lamports, vote_account.lamports());
assert_eq!(vote_state, *vote_account.vote_state().as_ref().unwrap());
Expand Down

0 comments on commit fa79265

Please sign in to comment.