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

minor VoteAccount refactoring (#23686)

This commit is contained in:
Jeff Washington (jwash) 2022-03-16 09:50:12 -05:00 committed by GitHub
parent cffc32af3e
commit fa7926580a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/vote_account.rs
View File

@ -5,7 +5,7 @@ use {
ser::{Serialize, Serializer},
},
solana_sdk::{
account::{Account, AccountSharedData},
account::{Account, AccountSharedData, ReadableAccount},
instruction::InstructionError,
pubkey::Pubkey,
},
@ -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()
@ -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());