gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor test cleanup and comments (#17283)

Browse Source
This commit is contained in:
Ryo Onodera
2021-05-18 07:22:43 +09:00
committed by GitHub
parent d461aba6a4
commit bcbe155575
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/bank.rs
View File

@ -6004,7 +6004,7 @@ pub(crate) mod tests {
let sysvar_and_native_proram_delta = 1; let sysvar_and_native_proram_delta = 1;
assert_eq!( assert_eq!(
previous_capitalization - current_capitalization + sysvar_and_native_proram_delta, previous_capitalization - (current_capitalization - sysvar_and_native_proram_delta),
burned_portion burned_portion
); );
@ -8480,6 +8480,7 @@ pub(crate) mod tests {
use sysvar::clock::Clock; use sysvar::clock::Clock;
let dummy_clock_id = solana_sdk::pubkey::new_rand(); let dummy_clock_id = solana_sdk::pubkey::new_rand();
let dummy_rent_epoch = 44;
let (mut genesis_config, _mint_keypair) = create_genesis_config(500); let (mut genesis_config, _mint_keypair) = create_genesis_config(500);
let expected_previous_slot = 3; let expected_previous_slot = 3;
@ -8496,19 +8497,22 @@ pub(crate) mod tests {
bank1.update_sysvar_account(&dummy_clock_id, |optional_account| { bank1.update_sysvar_account(&dummy_clock_id, |optional_account| {
assert!(optional_account.is_none()); assert!(optional_account.is_none());
create_account( let mut account = create_account(
&Clock { &Clock {
slot: expected_previous_slot, slot: expected_previous_slot,
..Clock::default() ..Clock::default()
}, },
bank1.inherit_specially_retained_account_fields(optional_account), bank1.inherit_specially_retained_account_fields(optional_account),
) );
account.set_rent_epoch(dummy_rent_epoch);
account
}); });
let current_account = bank1.get_account(&dummy_clock_id).unwrap(); let current_account = bank1.get_account(&dummy_clock_id).unwrap();
assert_eq!( assert_eq!(
expected_previous_slot, expected_previous_slot,
from_account::<Clock, _>(&current_account).unwrap().slot from_account::<Clock, _>(&current_account).unwrap().slot
); );
assert_eq!(dummy_rent_epoch, current_account.rent_epoch());
}, },
|old, new| { |old, new| {
assert_eq!(old + 1, new); assert_eq!(old + 1, new);
@ -8560,6 +8564,7 @@ pub(crate) mod tests {
expected_next_slot, expected_next_slot,
from_account::<Clock, _>(&current_account).unwrap().slot from_account::<Clock, _>(&current_account).unwrap().slot
); );
assert_eq!(INITIAL_RENT_EPOCH, current_account.rent_epoch());
}, },
|old, new| { |old, new| {
// if existing, capitalization shouldn't change // if existing, capitalization shouldn't change

2
runtime/src/rent_collector.rs
View File

@ -61,7 +61,7 @@ impl RentCollector {
address: &Pubkey, address: &Pubkey,
account: &mut AccountSharedData, account: &mut AccountSharedData,
) -> u64 { ) -> u64 {
if account.executable() if account.executable() // executable accounts must be rent-exempt balance
|| account.rent_epoch() > self.epoch || account.rent_epoch() > self.epoch
|| sysvar::check_id(account.owner()) || sysvar::check_id(account.owner())
|| *address == incinerator::id() || *address == incinerator::id()