gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

account.data -> data() (#15778)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-03-09 16:31:33 -06:00
committed by GitHub
parent 8a3135d17b
commit 52e54e1100
30 changed files with 220 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/stakes.rs
View File

@@ -2,7 +2,10 @@
//! node stakes
use crate::vote_account::{ArcVoteAccount, VoteAccounts};
use solana_sdk::{
account::AccountSharedData, clock::Epoch, pubkey::Pubkey, sysvar::stake_history::StakeHistory,
account::{AccountSharedData, ReadableAccount},
clock::Epoch,
pubkey::Pubkey,
sysvar::stake_history::StakeHistory,
};
use solana_stake_program::stake_state::{new_stake_history_entry, Delegation, StakeState};
use solana_vote_program::vote_state::VoteState;
@@ -109,7 +112,7 @@ impl Stakes {
pub fn is_stake(account: &AccountSharedData) -> bool {
solana_vote_program::check_id(&account.owner)
|| solana_stake_program::check_id(&account.owner)
&& account.data.len() >= std::mem::size_of::<StakeState>()
&& account.data().len() >= std::mem::size_of::<StakeState>()
}
pub fn store(
@@ -127,7 +130,7 @@ impl Stakes {
// when account is removed (lamports == 0 or data uninitialized), don't read so that
// given `pubkey` can be used for any owner in the future, while not affecting Stakes.
if account.lamports != 0
&& !(check_vote_init && VoteState::is_uninitialized_no_deser(&account.data))
&& !(check_vote_init && VoteState::is_uninitialized_no_deser(&account.data()))
{
let stake = old.as_ref().map_or_else(
|| {
@@ -409,7 +412,7 @@ pub mod tests {
}
// Vote account too big
let cache_data = vote_account.data.clone();
let cache_data = vote_account.data().to_vec();
vote_account.data.push(0);
stakes.store(&vote_pubkey, &vote_account, true, true);