From fa7926580a328a2e3662d14c23fb18333943a147 Mon Sep 17 00:00:00 2001 From: "Jeff Washington (jwash)" Date: Wed, 16 Mar 2022 09:50:12 -0500 Subject: [PATCH] minor VoteAccount refactoring (#23686) --- runtime/src/vote_account.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/src/vote_account.rs b/runtime/src/vote_account.rs index daaae5af9a..7c045906ec 100644 --- a/runtime/src/vote_account.rs +++ b/runtime/src/vote_account.rs @@ -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> { 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());