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

private AccountSharedData.owner (#16760) 

* private AccountSharedData.owner

* fix perf test
This commit is contained in:
Jeff Washington (jwash) 2021-04-26 14:59:17 -05:00 committed by GitHub
parent c54daa8009
commit 603872685d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf/tests/programs.rs
View File

@ -984,7 +984,7 @@ fn test_program_bpf_invoke_sanity() {
assert_eq!(43, bank.get_balance(&derived_key1)); assert_eq!(43, bank.get_balance(&derived_key1));
let account = bank.get_account(&derived_key1).unwrap(); let account = bank.get_account(&derived_key1).unwrap();
assert_eq!(invoke_program_id, account.owner); assert_eq!(&invoke_program_id, account.owner());
assert_eq!( assert_eq!(
MAX_PERMITTED_DATA_INCREASE, MAX_PERMITTED_DATA_INCREASE,
bank.get_account(&derived_key1).unwrap().data().len() bank.get_account(&derived_key1).unwrap().data().len()

4
runtime/src/accounts.rs
View File

@ -1038,7 +1038,7 @@ pub fn create_test_accounts(
for t in 0..num { for t in 0..num {
let pubkey = solana_sdk::pubkey::new_rand(); let pubkey = solana_sdk::pubkey::new_rand();
let account = let account =
AccountSharedData::new((t + 1) as u64, 0, &AccountSharedData::default().owner()); AccountSharedData::new((t + 1) as u64, 0, AccountSharedData::default().owner());
accounts.store_slow_uncached(slot, &pubkey, &account); accounts.store_slow_uncached(slot, &pubkey, &account);
pubkeys.push(pubkey); pubkeys.push(pubkey);
} }
@ -1049,7 +1049,7 @@ pub fn create_test_accounts(
pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64) { pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64) {
for pubkey in pubkeys { for pubkey in pubkeys {
let amount = thread_rng().gen_range(0, 10); let amount = thread_rng().gen_range(0, 10);
let account = AccountSharedData::new(amount, 0, &AccountSharedData::default().owner()); let account = AccountSharedData::new(amount, 0, AccountSharedData::default().owner());
accounts.store_slow_uncached(slot, &pubkey, &account); accounts.store_slow_uncached(slot, &pubkey, &account);
} }
} }

2
sdk/src/account.rs
View File

@ -35,7 +35,7 @@ pub struct AccountSharedData {
/// data held in this account /// data held in this account
data: Arc<Vec<u8>>, data: Arc<Vec<u8>>,
/// the program that owns this account. If executable, the program that loads this account. /// the program that owns this account. If executable, the program that loads this account.
pub owner: Pubkey, owner: Pubkey,
/// this account's data contains a loaded program (and is now read-only) /// this account's data contains a loaded program (and is now read-only)
pub executable: bool, pub executable: bool,
/// the epoch at which this account will next owe rent /// the epoch at which this account will next owe rent