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

tests: lamports -= to checked_sub (#16843)

This commit is contained in:
Jeff Washington (jwash) 2021-04-27 09:12:48 -05:00 committed by GitHub
parent 998cba74b5
commit 3fdbaefaa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/src/accounts_db.rs
View File

@ -7376,7 +7376,7 @@ pub mod tests {
// Lamports changes to not affect the hash
let mut account_modified = account.clone();
account_modified.lamports -= 1;
account_modified.checked_sub_lamports(1).unwrap();
assert_eq!(
hash,
AccountsDb::hash_frozen_account_data(&account_modified)
@ -7464,7 +7464,7 @@ pub mod tests {
db.freeze_accounts(&ancestors, &[frozen_pubkey]);
// Store with a decrease below the frozen amount of lamports is not ok
account.lamports -= 1;
account.checked_sub_lamports(1).unwrap();
db.store_uncached(0, &[(&frozen_pubkey, &account)]);
}
@ -7566,7 +7566,7 @@ pub mod tests {
db.store_uncached(some_slot, &[(&key, &account)]);
let mut account = db.load_without_fixed_root(&ancestors, &key).unwrap().0;
account.lamports -= 1;
account.checked_sub_lamports(1).unwrap();
account.executable = true;
db.store_uncached(some_slot, &[(&key, &account)]);
db.add_root(some_slot);

8
runtime/tests/accounts.rs
View File

@ -6,7 +6,11 @@ use solana_runtime::{
accounts_index::Ancestors,
};
use solana_sdk::genesis_config::ClusterType;
use solana_sdk::{account::AccountSharedData, clock::Slot, pubkey::Pubkey};
use solana_sdk::{
account::{AccountSharedData, WritableAccount},
clock::Slot,
pubkey::Pubkey,
};
use std::collections::HashSet;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
@ -47,7 +51,7 @@ fn test_shrink_and_clean() {
alive_accounts.retain(|(_pubkey, account)| account.lamports >= 1);
for (pubkey, account) in alive_accounts.iter_mut() {
account.lamports -= 1;
account.checked_sub_lamports(1).unwrap();
accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
}
accounts.add_root(current_slot);