Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.17: Use BankForks on tests - Part 1 (backport of #34206) #34354

Closed
wants to merge 2 commits into from
Closed

v1.17: Use BankForks on tests - Part 1 (backport of #34206) #34354

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e7e265
Use `BankForks` on tests - Part 1 (#34206)
LucasSte Nov 27, 2023
6e2ee79
fix merge conflicts
pgarg66 Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 39 additions & 90 deletions runtime/src/bank/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,7 @@ pub fn new_bank_from_parent_for_tests(
slot: Slot,
) -> Arc<Bank> {
let bank = Bank::new_from_parent(parent, collector_id, slot);
bank_forks
.write()
.unwrap()
.insert(bank)
.clone_without_scheduler()
bank_forks.write().unwrap().insert(bank)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Insert returns BankWithScheduler, but the function returns Arc<Bank>, so I think we need the clone_without_scheduler here, don't we?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v1.17 doesn't seem to have that.

}

#[test]
Expand Down Expand Up @@ -2499,11 +2495,7 @@ fn test_bank_tx_fee() {
let (expected_fee_collected, expected_fee_burned) =
genesis_config.fee_rate_governor.burn(expected_fee_paid);

<<<<<<< HEAD
let bank = Bank::new_for_tests(&genesis_config);
=======
let (bank, bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))

let capitalization = bank.capitalization();

Expand Down Expand Up @@ -2552,11 +2544,7 @@ fn test_bank_tx_fee() {
);

// Verify that an InstructionError collects fees, too
<<<<<<< HEAD
let bank = Bank::new_from_parent(Arc::new(bank), &leader, 1);
=======
let bank = new_bank_from_parent_for_tests(bank_forks.as_ref(), bank, &leader, 1);
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
let mut tx = system_transaction::transfer(&mint_keypair, &key, 1, bank.last_blockhash());
// Create a bogus instruction to system_program to cause an instruction error
tx.message.instructions[0].data[0] = 40;
Expand Down Expand Up @@ -2620,11 +2608,7 @@ fn test_bank_tx_compute_unit_fee() {
let (expected_fee_collected, expected_fee_burned) =
genesis_config.fee_rate_governor.burn(expected_fee_paid);

<<<<<<< HEAD
let bank = Bank::new_for_tests(&genesis_config);
=======
let (bank, bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))

let capitalization = bank.capitalization();

Expand Down Expand Up @@ -2672,11 +2656,7 @@ fn test_bank_tx_compute_unit_fee() {
);

// Verify that an InstructionError collects fees, too
<<<<<<< HEAD
let bank = Bank::new_from_parent(Arc::new(bank), &leader, 1);
=======
let bank = new_bank_from_parent_for_tests(bank_forks.as_ref(), bank, &leader, 1);
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
let mut tx = system_transaction::transfer(&mint_keypair, &key, 1, bank.last_blockhash());
// Create a bogus instruction to system_program to cause an instruction error
tx.message.instructions[0].data[0] = 40;
Expand Down Expand Up @@ -2726,18 +2706,13 @@ fn test_bank_blockhash_fee_structure() {
.target_lamports_per_signature = 5000;
genesis_config.fee_rate_governor.target_signatures_per_slot = 0;

<<<<<<< HEAD
let bank = Bank::new_for_tests(&genesis_config);
goto_end_of_slot(&bank);
=======
let (bank, _) = Bank::new_with_bank_forks_for_tests(&genesis_config);
goto_end_of_slot(bank.clone());
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
goto_end_of_slot(&bank);
let cheap_blockhash = bank.last_blockhash();
let cheap_lamports_per_signature = bank.get_lamports_per_signature();
assert_eq!(cheap_lamports_per_signature, 0);

let bank = Bank::new_from_parent(Arc::new(bank), &leader, 1);
let bank = Bank::new_from_parent(bank, &leader, 1);
goto_end_of_slot(&bank);
let expensive_blockhash = bank.last_blockhash();
let expensive_lamports_per_signature = bank.get_lamports_per_signature();
Expand Down Expand Up @@ -2783,33 +2758,19 @@ fn test_bank_blockhash_compute_unit_fee_structure() {
.target_lamports_per_signature = 1000;
genesis_config.fee_rate_governor.target_signatures_per_slot = 1;

<<<<<<< HEAD
let bank = Bank::new_for_tests(&genesis_config);
goto_end_of_slot(&bank);
=======
let (bank, bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
goto_end_of_slot(bank.clone());
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
goto_end_of_slot(&bank);
let cheap_blockhash = bank.last_blockhash();
let cheap_lamports_per_signature = bank.get_lamports_per_signature();
assert_eq!(cheap_lamports_per_signature, 0);

<<<<<<< HEAD
let bank = Bank::new_from_parent(Arc::new(bank), &leader, 1);
goto_end_of_slot(&bank);
=======
let bank = new_bank_from_parent_for_tests(bank_forks.as_ref(), bank, &leader, 1);
goto_end_of_slot(bank.clone());
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
goto_end_of_slot(&bank);
let expensive_blockhash = bank.last_blockhash();
let expensive_lamports_per_signature = bank.get_lamports_per_signature();
assert!(cheap_lamports_per_signature < expensive_lamports_per_signature);

<<<<<<< HEAD
let bank = Bank::new_from_parent(Arc::new(bank), &leader, 2);
=======
let bank = new_bank_from_parent_for_tests(bank_forks.as_ref(), bank, &leader, 2);
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))

// Send a transfer using cheap_blockhash
let key = solana_sdk::pubkey::new_rand();
Expand Down Expand Up @@ -4727,16 +4688,16 @@ fn test_recent_blockhashes_sysvar() {
let most_recent_hash = recent_blockhashes.iter().next().unwrap().blockhash;
// Check order
assert!(bank.is_hash_valid_for_age(&most_recent_hash, 0));
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}
}

#[allow(deprecated)]
#[test]
fn test_blockhash_queue_sysvar_consistency() {
let mut bank = create_simple_test_arc_bank(100_000);
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
let bank = create_simple_test_arc_bank(100_000);
goto_end_of_slot(&bank);

let bhq_account = bank.get_account(&sysvar::recent_blockhashes::id()).unwrap();
let recent_blockhashes =
Expand Down Expand Up @@ -4895,13 +4856,8 @@ where
// Banks 0 and 1 have no fees, wait two blocks before
// initializing our nonce accounts
for _ in 0..2 {
<<<<<<< HEAD
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
bank = Arc::new(new_from_parent(bank));
=======
goto_end_of_slot(bank.clone());
goto_end_of_slot(&bank);
bank = new_from_parent_with_fork_next_slot(bank, bank_forks.as_ref());
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))
}

let (custodian_keypair, nonce_keypair) = nonce_setup(
Expand All @@ -4914,13 +4870,8 @@ where

// The setup nonce is not valid to be used until the next bank
// so wait one more block
<<<<<<< HEAD
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
bank = Arc::new(new_from_parent(bank));
=======
goto_end_of_slot(bank.clone());
goto_end_of_slot(&bank);
bank = new_from_parent_with_fork_next_slot(bank, bank_forks.as_ref());
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))

Ok((bank, mint_keypair, custodian_keypair, nonce_keypair))
}
Expand Down Expand Up @@ -5174,7 +5125,7 @@ fn test_nonce_transaction() {

/* Kick nonce hash off the blockhash_queue */
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5243,7 +5194,7 @@ fn test_nonce_transaction() {

/* Kick nonce hash off the blockhash_queue */
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5301,7 +5252,7 @@ fn test_nonce_transaction_with_tx_wide_caps() {

/* Kick nonce hash off the blockhash_queue */
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5370,7 +5321,7 @@ fn test_nonce_transaction_with_tx_wide_caps() {

/* Kick nonce hash off the blockhash_queue */
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5438,7 +5389,7 @@ fn test_nonce_authority() {
let nonce_hash = get_nonce_blockhash(&bank, &nonce_pubkey).unwrap();

for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5496,7 +5447,7 @@ fn test_nonce_payer() {
let nonce_hash = get_nonce_blockhash(&bank, &nonce_pubkey).unwrap();

for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5561,7 +5512,7 @@ fn test_nonce_payer_tx_wide_cap() {
let nonce_hash = get_nonce_blockhash(&bank, &nonce_pubkey).unwrap();

for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5629,7 +5580,7 @@ fn test_nonce_fee_calculator_updates() {

// Kick nonce hash off the blockhash_queue
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5697,7 +5648,7 @@ fn test_nonce_fee_calculator_updates_tx_wide_cap() {

// Kick nonce hash off the blockhash_queue
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}

Expand Down Expand Up @@ -5777,7 +5728,7 @@ fn test_check_ro_durable_nonce_fails() {
);
// Kick nonce hash off the blockhash_queue
for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
bank = Arc::new(new_from_parent(bank));
}
// Caught by the runtime because it is a nonce transaction
Expand Down Expand Up @@ -6398,7 +6349,7 @@ fn test_bank_hash_consistency() {
// Check a few slots, cross an epoch boundary
assert_eq!(bank.get_slots_in_epoch(0), 32);
loop {
goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
goto_end_of_slot(&bank);
if bank.slot == 0 {
assert_eq!(
bank.hash().to_string(),
Expand Down Expand Up @@ -6468,13 +6419,13 @@ fn get_shrink_account_size() -> usize {

// Set root for bank 0, with caching disabled so we can get the size
// of the storage for this slot
let mut bank0 = Arc::new(Bank::new_with_config_for_tests(
let bank0 = Arc::new(Bank::new_with_config_for_tests(
&genesis_config,
AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(),
));
bank0.restore_old_behavior_for_fragile_tests();
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank0).unwrap());
goto_end_of_slot(&bank0);
bank0.freeze();
bank0.squash();
add_root_and_flush_write_cache(&bank0);
Expand Down Expand Up @@ -6507,15 +6458,15 @@ fn test_clean_nonrooted() {
info!("pubkey1: {}", pubkey1);

// Set root for bank 0, with caching enabled
let mut bank0 = Arc::new(Bank::new_with_config_for_tests(
let bank0 = Arc::new(Bank::new_with_config_for_tests(
&genesis_config,
AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(),
));

let account_zero = AccountSharedData::new(0, 0, &Pubkey::new_unique());

goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank0).unwrap());
goto_end_of_slot(&bank0);
bank0.freeze();
bank0.squash();
// Flush now so that accounts cache cleaning doesn't clean up bank 0 when later
Expand All @@ -6524,20 +6475,20 @@ fn test_clean_nonrooted() {

// Store some lamports in bank 1
let some_lamports = 123;
let mut bank1 = Arc::new(Bank::new_from_parent(bank0.clone(), &Pubkey::default(), 1));
let bank1 = Arc::new(Bank::new_from_parent(bank0.clone(), &Pubkey::default(), 1));
test_utils::deposit(&bank1, &pubkey0, some_lamports).unwrap();
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank1).unwrap());
goto_end_of_slot(&bank1);
bank1.freeze();
bank1.flush_accounts_cache_slot_for_tests();

bank1.print_accounts_stats();

// Store some lamports for pubkey1 in bank 2, root bank 2
// bank2's parent is bank0
let mut bank2 = Arc::new(Bank::new_from_parent(bank0, &Pubkey::default(), 2));
let bank2 = Arc::new(Bank::new_from_parent(bank0, &Pubkey::default(), 2));
test_utils::deposit(&bank2, &pubkey1, some_lamports).unwrap();
bank2.store_account(&pubkey0, &account_zero);
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank2).unwrap());
goto_end_of_slot(&bank2);
bank2.freeze();
bank2.squash();
bank2.force_flush_accounts_cache();
Expand All @@ -6549,9 +6500,9 @@ fn test_clean_nonrooted() {
// candidate set
bank2.clean_accounts_for_tests();

let mut bank3 = Arc::new(Bank::new_from_parent(bank2, &Pubkey::default(), 3));
let bank3 = Arc::new(Bank::new_from_parent(bank2, &Pubkey::default(), 3));
test_utils::deposit(&bank3, &pubkey1, some_lamports + 1).unwrap();
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank3).unwrap());
goto_end_of_slot(&bank3);
bank3.freeze();
bank3.squash();
bank3.force_flush_accounts_cache();
Expand Down Expand Up @@ -6582,7 +6533,7 @@ fn test_shrink_candidate_slots_cached() {
let pubkey2 = solana_sdk::pubkey::new_rand();

// Set root for bank 0, with caching enabled
let mut bank0 = Arc::new(Bank::new_with_config_for_tests(
let bank0 = Arc::new(Bank::new_with_config_for_tests(
&genesis_config,
AccountSecondaryIndexes::default(),
AccountShrinkThreshold::default(),
Expand All @@ -6594,7 +6545,7 @@ fn test_shrink_candidate_slots_cached() {
let account0 = AccountSharedData::new(1000, pubkey0_size, &Pubkey::new_unique());
bank0.store_account(&pubkey0, &account0);

goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank0).unwrap());
goto_end_of_slot(&bank0);
bank0.freeze();
bank0.squash();
// Flush now so that accounts cache cleaning doesn't clean up bank 0 when later
Expand All @@ -6603,21 +6554,21 @@ fn test_shrink_candidate_slots_cached() {

// Store some lamports in bank 1
let some_lamports = 123;
let mut bank1 = Arc::new(new_from_parent(bank0));
let bank1 = Arc::new(new_from_parent(bank0));
test_utils::deposit(&bank1, &pubkey1, some_lamports).unwrap();
test_utils::deposit(&bank1, &pubkey2, some_lamports).unwrap();
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank1).unwrap());
goto_end_of_slot(&bank1);
bank1.freeze();
bank1.squash();
// Flush now so that accounts cache cleaning doesn't clean up bank 0 when later
// slots add updates to the cache
bank1.force_flush_accounts_cache();

// Store some lamports for pubkey1 in bank 2, root bank 2
let mut bank2 = Arc::new(new_from_parent(bank1));
let bank2 = Arc::new(new_from_parent(bank1));
test_utils::deposit(&bank2, &pubkey1, some_lamports).unwrap();
bank2.store_account(&pubkey0, &account0);
goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank2).unwrap());
goto_end_of_slot(&bank2);
bank2.freeze();
bank2.squash();
bank2.force_flush_accounts_cache();
Expand Down Expand Up @@ -11664,13 +11615,11 @@ fn test_cap_accounts_data_allocations_per_transaction() {
/ MAX_PERMITTED_DATA_LENGTH as usize;

let (genesis_config, mint_keypair) = create_genesis_config(1_000_000 * LAMPORTS_PER_SOL);
<<<<<<< HEAD
let mut bank = Bank::new_for_tests(&genesis_config);
bank.activate_feature(&feature_set::enable_early_verification_of_account_modifications::id());
bank.activate_feature(&feature_set::cap_accounts_data_allocations_per_transaction::id());
=======
let bank = Bank::new_with_bank_forks_for_tests(&genesis_config).0;
>>>>>>> e83276522a (Use `BankForks` on tests - Part 1 (#34206))

let bank = Bank::wrap_with_bank_forks_for_tests(bank).0;

let mut instructions = Vec::new();
let mut keypairs = vec![mint_keypair.insecure_clone()];
Expand Down