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

consolidate Rent construction in test code (#23018)

This commit is contained in:
Jeff Washington (jwash) 2022-02-08 21:51:52 -06:00 committed by GitHub
parent c7aa7fb66b
commit fb47c1f0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
runtime/src/bank.rs
View File

@ -7013,6 +7013,14 @@ pub(crate) mod tests {
); );
} }
fn rent_with_exemption_threshold(exemption_threshold: f64) -> Rent {
Rent {
lamports_per_byte_year: 1,
exemption_threshold,
burn_percent: 10,
}
}
#[test] #[test]
fn test_credit_debit_rent_no_side_effect_on_hash() { fn test_credit_debit_rent_no_side_effect_on_hash() {
solana_logger::setup(); solana_logger::setup();
@ -7027,11 +7035,7 @@ pub(crate) mod tests {
let keypair5: Keypair = Keypair::new(); let keypair5: Keypair = Keypair::new();
let keypair6: Keypair = Keypair::new(); let keypair6: Keypair = Keypair::new();
genesis_config.rent = Rent { genesis_config.rent = rent_with_exemption_threshold(21.0);
lamports_per_byte_year: 1,
exemption_threshold: 21.0,
burn_percent: 10,
};
let root_bank = Arc::new(Bank::new_for_tests(&genesis_config)); let root_bank = Arc::new(Bank::new_for_tests(&genesis_config));
let bank = Bank::new_from_parent( let bank = Bank::new_from_parent(
@ -7339,11 +7343,7 @@ pub(crate) mod tests {
false, false,
); );
genesis_config.rent = Rent { genesis_config.rent = rent_with_exemption_threshold(2.0);
lamports_per_byte_year: 1,
exemption_threshold: 2.0,
burn_percent: 10,
};
let rent = Rent::free(); let rent = Rent::free();
@ -7446,11 +7446,7 @@ pub(crate) mod tests {
Account::from(validator_3_vote_account), Account::from(validator_3_vote_account),
); );
genesis_config.rent = Rent { genesis_config.rent = rent_with_exemption_threshold(10.0);
lamports_per_byte_year: 1,
exemption_threshold: 10.0,
burn_percent: 10,
};
let mut bank = Bank::new_for_tests(&genesis_config); let mut bank = Bank::new_for_tests(&genesis_config);
// Enable rent collection // Enable rent collection
@ -7617,11 +7613,7 @@ pub(crate) mod tests {
#[test] #[test]
fn test_rent_exempt_executable_account() { fn test_rent_exempt_executable_account() {
let (mut genesis_config, mint_keypair) = create_genesis_config(100_000); let (mut genesis_config, mint_keypair) = create_genesis_config(100_000);
genesis_config.rent = Rent { genesis_config.rent = rent_with_exemption_threshold(1000.0);
lamports_per_byte_year: 1,
exemption_threshold: 1000.0,
burn_percent: 10,
};
let root_bank = Arc::new(Bank::new_for_tests(&genesis_config)); let root_bank = Arc::new(Bank::new_for_tests(&genesis_config));
let bank = create_child_bank_for_rent_test(&root_bank, &genesis_config); let bank = create_child_bank_for_rent_test(&root_bank, &genesis_config);
@ -7692,11 +7684,7 @@ pub(crate) mod tests {
keypairs.push(Keypair::new()); keypairs.push(Keypair::new());
} }
genesis_config.rent = Rent { genesis_config.rent = rent_with_exemption_threshold(1000.0);
lamports_per_byte_year: 1,
exemption_threshold: 1000.0,
burn_percent: 10,
};
let root_bank = Bank::new_for_tests(&genesis_config); let root_bank = Bank::new_for_tests(&genesis_config);
// until we completely transition to the eager rent collection, // until we completely transition to the eager rent collection,