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

rent: refactor test function (#23014)

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

12
runtime/src/rent_collector.rs
View File

@ -203,6 +203,10 @@ mod tests {
solana_sdk::{account::Account, sysvar}, solana_sdk::{account::Account, sysvar},
}; };
fn default_rent_collector_clone_with_epoch(epoch: Epoch) -> RentCollector {
RentCollector::default().clone_with_epoch(epoch)
}
#[test] #[test]
fn test_collect_from_account_created_and_existing() { fn test_collect_from_account_created_and_existing() {
let old_lamports = 1000; let old_lamports = 1000;
@ -219,7 +223,7 @@ mod tests {
(account.clone(), account) (account.clone(), account)
}; };
let rent_collector = RentCollector::default().clone_with_epoch(new_epoch); let rent_collector = default_rent_collector_clone_with_epoch(new_epoch);
// collect rent on a newly-created account // collect rent on a newly-created account
let collected = rent_collector let collected = rent_collector
@ -263,7 +267,7 @@ mod tests {
assert_eq!(account.rent_epoch(), 0); assert_eq!(account.rent_epoch(), 0);
// create a tested rent collector // create a tested rent collector
let rent_collector = RentCollector::default().clone_with_epoch(epoch); let rent_collector = default_rent_collector_clone_with_epoch(epoch);
// first mark account as being collected while being rent-exempt // first mark account as being collected while being rent-exempt
let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, None); let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, None);
@ -291,7 +295,7 @@ mod tests {
assert_eq!(account.rent_epoch(), 0); assert_eq!(account.rent_epoch(), 0);
let epoch = 3; let epoch = 3;
let rent_collector = RentCollector::default().clone_with_epoch(epoch); let rent_collector = default_rent_collector_clone_with_epoch(epoch);
let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, None); let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, None);
assert_eq!(account.lamports(), 0); assert_eq!(account.lamports(), 0);
@ -311,7 +315,7 @@ mod tests {
rent_epoch: account_rent_epoch, rent_epoch: account_rent_epoch,
..Account::default() ..Account::default()
}); });
let rent_collector = RentCollector::default().clone_with_epoch(account_rent_epoch + 2); let rent_collector = default_rent_collector_clone_with_epoch(account_rent_epoch + 2);
let collected = let collected =
rent_collector.collect_from_existing_account(&Pubkey::new_unique(), &mut account, None); rent_collector.collect_from_existing_account(&Pubkey::new_unique(), &mut account, None);