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

accounts tests use store_for_tests (#29554)

This commit is contained in:
Jeff Washington (jwash) 2023-01-06 14:07:36 -06:00 committed by GitHub
parent 33119f8a87
commit 2a0a185846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
runtime/src/accounts.rs
View File

@ -2694,10 +2694,10 @@ mod tests {
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(), AccountShrinkThreshold::default(),
); );
accounts.store_slow_uncached(0, &keypair0.pubkey(), &account0); accounts.store_for_tests(0, &keypair0.pubkey(), &account0);
accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1); accounts.store_for_tests(0, &keypair1.pubkey(), &account1);
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_for_tests(0, &keypair2.pubkey(), &account2);
accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3); accounts.store_for_tests(0, &keypair3.pubkey(), &account3);
let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])]; let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
let message = Message::new_with_compiled_instructions( let message = Message::new_with_compiled_instructions(
@ -2803,9 +2803,9 @@ mod tests {
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(), AccountShrinkThreshold::default(),
); );
accounts.store_slow_uncached(0, &keypair0.pubkey(), &account0); accounts.store_for_tests(0, &keypair0.pubkey(), &account0);
accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1); accounts.store_for_tests(0, &keypair1.pubkey(), &account1);
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_for_tests(0, &keypair2.pubkey(), &account2);
let accounts_arc = Arc::new(accounts); let accounts_arc = Arc::new(accounts);
@ -2932,6 +2932,13 @@ mod tests {
.contains(&keypair1.pubkey())); .contains(&keypair1.pubkey()));
} }
impl Accounts {
/// callers use to call store_uncached. But, this is not allowed anymore.
pub fn store_for_tests(&self, slot: Slot, pubkey: &Pubkey, account: &AccountSharedData) {
self.accounts_db.store_for_tests(slot, &[(pubkey, account)])
}
}
#[test] #[test]
fn test_accounts_locks_with_results() { fn test_accounts_locks_with_results() {
let keypair0 = Keypair::new(); let keypair0 = Keypair::new();
@ -2950,10 +2957,10 @@ mod tests {
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(), AccountShrinkThreshold::default(),
); );
accounts.store_slow_uncached(0, &keypair0.pubkey(), &account0); accounts.store_for_tests(0, &keypair0.pubkey(), &account0);
accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1); accounts.store_for_tests(0, &keypair1.pubkey(), &account1);
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_for_tests(0, &keypair2.pubkey(), &account2);
accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3); accounts.store_for_tests(0, &keypair3.pubkey(), &account3);
let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])]; let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
let message = Message::new_with_compiled_instructions( let message = Message::new_with_compiled_instructions(
@ -3763,11 +3770,11 @@ mod tests {
let pubkey1 = keys.pop().unwrap(); let pubkey1 = keys.pop().unwrap();
let pubkey0 = keys.pop().unwrap(); let pubkey0 = keys.pop().unwrap();
let account0 = AccountSharedData::new(42, 0, &Pubkey::default()); let account0 = AccountSharedData::new(42, 0, &Pubkey::default());
accounts.store_slow_uncached(0, &pubkey0, &account0); accounts.store_for_tests(0, &pubkey0, &account0);
let account1 = AccountSharedData::new(42, 0, &Pubkey::default()); let account1 = AccountSharedData::new(42, 0, &Pubkey::default());
accounts.store_slow_uncached(0, &pubkey1, &account1); accounts.store_for_tests(0, &pubkey1, &account1);
let account2 = AccountSharedData::new(41, 0, &Pubkey::default()); let account2 = AccountSharedData::new(41, 0, &Pubkey::default());
accounts.store_slow_uncached(0, &pubkey2, &account2); accounts.store_for_tests(0, &pubkey2, &account2);
let ancestors = vec![(0, 0)].into_iter().collect(); let ancestors = vec![(0, 0)].into_iter().collect();
let all_pubkeys: HashSet<_> = vec![pubkey0, pubkey1, pubkey2].into_iter().collect(); let all_pubkeys: HashSet<_> = vec![pubkey0, pubkey1, pubkey2].into_iter().collect();
@ -4059,7 +4066,7 @@ mod tests {
let keypair = Keypair::new(); let keypair = Keypair::new();
let mut account = AccountSharedData::new(1, space, &native_loader::id()); let mut account = AccountSharedData::new(1, space, &native_loader::id());
account.set_executable(true); account.set_executable(true);
accounts.store_slow_uncached(0, &keypair.pubkey(), &account); accounts.store_for_tests(0, &keypair.pubkey(), &account);
let mut accumulated_accounts_data_size: usize = 0; let mut accumulated_accounts_data_size: usize = 0;
let mut expect_accumulated_accounts_data_size: usize; let mut expect_accumulated_accounts_data_size: usize;
@ -4148,7 +4155,7 @@ mod tests {
let program_data_account_size = program_data_account.data().len(); let program_data_account_size = program_data_account.data().len();
program_data_account.set_executable(true); program_data_account.set_executable(true);
program_data_account.set_rent_epoch(0); program_data_account.set_rent_epoch(0);
accounts.store_slow_uncached(0, &programdata_key, &program_data_account); accounts.store_for_tests(0, &programdata_key, &program_data_account);
let program_key = Pubkey::new(&[2u8; 32]); let program_key = Pubkey::new(&[2u8; 32]);
let program = UpgradeableLoaderState::Program { let program = UpgradeableLoaderState::Program {
@ -4159,17 +4166,17 @@ mod tests {
let program_account_size = program_account.data().len(); let program_account_size = program_account.data().len();
program_account.set_executable(true); program_account.set_executable(true);
program_account.set_rent_epoch(0); program_account.set_rent_epoch(0);
accounts.store_slow_uncached(0, &program_key, &program_account); accounts.store_for_tests(0, &program_key, &program_account);
let key0 = Pubkey::new(&[1u8; 32]); let key0 = Pubkey::new(&[1u8; 32]);
let mut bpf_loader_account = AccountSharedData::new(1, 0, &key0); let mut bpf_loader_account = AccountSharedData::new(1, 0, &key0);
bpf_loader_account.set_executable(true); bpf_loader_account.set_executable(true);
accounts.store_slow_uncached(0, &bpf_loader_upgradeable::id(), &bpf_loader_account); accounts.store_for_tests(0, &bpf_loader_upgradeable::id(), &bpf_loader_account);
let space: usize = 9; let space: usize = 9;
let mut account = AccountSharedData::new(1, space, &native_loader::id()); let mut account = AccountSharedData::new(1, space, &native_loader::id());
account.set_executable(true); account.set_executable(true);
accounts.store_slow_uncached(0, &key0, &account); accounts.store_for_tests(0, &key0, &account);
// test: program_key account has been loaded as non-loader, load_executable_accounts // test: program_key account has been loaded as non-loader, load_executable_accounts
// will not double count its data size, but still accumulate data size from // will not double count its data size, but still accumulate data size from