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

Add Bank::clean_accounts_for_tests() (#27209)

This commit is contained in:
Brooks Prumo 2022-08-19 12:09:35 -04:00 committed by GitHub
parent 6da3eb028c
commit 2184d0ff26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/src/bank.rs
View File

@ -8085,6 +8085,12 @@ pub(crate) mod tests {
}
}
impl Bank {
fn clean_accounts_for_tests(&self) {
self.rc.accounts.accounts_db.clean_accounts_for_tests()
}
}
#[test]
fn test_nonce_info() {
let lamports_per_signature = 42;
@ -10403,7 +10409,7 @@ pub(crate) mod tests {
bank.squash();
bank.force_flush_accounts_cache();
let hash = bank.update_accounts_hash();
bank.clean_accounts(false, false, None);
bank.clean_accounts_for_tests();
assert_eq!(bank.update_accounts_hash(), hash);
let bank0 = Arc::new(new_from_parent(&bank));
@ -10426,7 +10432,7 @@ pub(crate) mod tests {
info!("bank0 purge");
let hash = bank0.update_accounts_hash();
bank0.clean_accounts(false, false, None);
bank0.clean_accounts_for_tests();
assert_eq!(bank0.update_accounts_hash(), hash);
assert_eq!(
@ -10436,7 +10442,7 @@ pub(crate) mod tests {
assert_eq!(bank1.get_account(&keypair.pubkey()), None);
info!("bank1 purge");
bank1.clean_accounts(false, false, None);
bank1.clean_accounts_for_tests();
assert_eq!(
bank0.get_account(&keypair.pubkey()).unwrap().lamports(),
@ -10460,7 +10466,7 @@ pub(crate) mod tests {
assert_eq!(bank0.get_account(&keypair.pubkey()), None);
assert_eq!(bank1.get_account(&keypair.pubkey()), None);
bank1.force_flush_accounts_cache();
bank1.clean_accounts(false, false, None);
bank1.clean_accounts_for_tests();
assert!(bank1.verify_bank_hash(VerifyBankHash::default_for_test()));
}
@ -14689,7 +14695,7 @@ pub(crate) mod tests {
// Clean accounts, which should add earlier slots to the shrink
// candidate set
bank2.clean_accounts(false, false, None);
bank2.clean_accounts_for_tests();
let mut bank3 = Arc::new(Bank::new_from_parent(&bank2, &Pubkey::default(), 3));
bank3.deposit(&pubkey1, some_lamports + 1).unwrap();
@ -14698,7 +14704,7 @@ pub(crate) mod tests {
bank3.squash();
bank3.force_flush_accounts_cache();
bank3.clean_accounts(false, false, None);
bank3.clean_accounts_for_tests();
assert_eq!(
bank3.rc.accounts.accounts_db.ref_count_for_pubkey(&pubkey0),
2
@ -14767,7 +14773,7 @@ pub(crate) mod tests {
// Clean accounts, which should add earlier slots to the shrink
// candidate set
bank2.clean_accounts(false, false, None);
bank2.clean_accounts_for_tests();
// Slots 0 and 1 should be candidates for shrinking, but slot 2
// shouldn't because none of its accounts are outdated by a later
@ -14821,7 +14827,7 @@ pub(crate) mod tests {
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank).unwrap());
bank.squash();
bank.clean_accounts(false, false, None);
bank.clean_accounts_for_tests();
let force_to_return_alive_account = 0;
assert_eq!(
bank.process_stale_slot_with_budget(22, force_to_return_alive_account),
@ -16206,7 +16212,7 @@ pub(crate) mod tests {
current_major_fork_bank.squash();
// Try to get cache flush/clean to overlap with the scan
current_major_fork_bank.force_flush_accounts_cache();
current_major_fork_bank.clean_accounts(false, false, None);
current_major_fork_bank.clean_accounts_for_tests();
// Move purge here so that Bank::drop()->purge_slots() doesn't race
// with clean. Simulates the call from AccountsBackgroundService
abs_request_handler.handle_pruned_banks(&current_major_fork_bank, true);
@ -17335,7 +17341,7 @@ pub(crate) mod tests {
bank2.squash();
drop(bank1);
bank2.clean_accounts(false, false, None);
bank2.clean_accounts_for_tests();
let expected_ref_count_for_cleaned_up_keys = 0;
let expected_ref_count_for_keys_in_both_slot1_and_slot2 = 1;