diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs index 6bf14e1a43e095..987915d8c9fe15 100644 --- a/accounts-bench/src/main.rs +++ b/accounts-bench/src/main.rs @@ -6,7 +6,10 @@ use { rayon::prelude::*, solana_measure::measure::Measure, solana_runtime::{ - accounts::{create_test_accounts, update_accounts_bench, Accounts}, + accounts::{ + test_utils::{create_test_accounts, update_accounts_bench}, + Accounts, + }, accounts_db::AccountShrinkThreshold, accounts_index::AccountSecondaryIndexes, ancestors::Ancestors, diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs index b4749877038e30..24ad6761d98ac9 100644 --- a/runtime/benches/accounts.rs +++ b/runtime/benches/accounts.rs @@ -8,7 +8,7 @@ use { rand::Rng, rayon::iter::{IntoParallelRefIterator, ParallelIterator}, solana_runtime::{ - accounts::{create_test_accounts, AccountAddressFilter, Accounts}, + accounts::{test_utils::create_test_accounts, AccountAddressFilter, Accounts}, accounts_db::AccountShrinkThreshold, accounts_index::{AccountSecondaryIndexes, ScanConfig}, ancestors::Ancestors, diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index d1f334da7353b1..ded4dc0625ccf2 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -1311,28 +1311,33 @@ pub fn prepare_if_nonce_account<'a>( } } -pub fn create_test_accounts( - accounts: &Accounts, - pubkeys: &mut Vec, - num: usize, - slot: Slot, -) { - for t in 0..num { - let pubkey = solana_sdk::pubkey::new_rand(); - let account = - AccountSharedData::new((t + 1) as u64, 0, AccountSharedData::default().owner()); - accounts.store_slow_uncached(slot, &pubkey, &account); - pubkeys.push(pubkey); +/// A set of utility functions used for testing and benchmarking +pub mod test_utils { + use super::*; + + pub fn create_test_accounts( + accounts: &Accounts, + pubkeys: &mut Vec, + num: usize, + slot: Slot, + ) { + for t in 0..num { + let pubkey = solana_sdk::pubkey::new_rand(); + let account = + AccountSharedData::new((t + 1) as u64, 0, AccountSharedData::default().owner()); + accounts.store_slow_uncached(slot, &pubkey, &account); + pubkeys.push(pubkey); + } } -} -// Only used by bench, not safe to call otherwise accounts can conflict with the -// accounts cache! -pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64) { - for pubkey in pubkeys { - let amount = thread_rng().gen_range(0, 10); - let account = AccountSharedData::new(amount, 0, AccountSharedData::default().owner()); - accounts.store_slow_uncached(slot, pubkey, &account); + // Only used by bench, not safe to call otherwise accounts can conflict with the + // accounts cache! + pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64) { + for pubkey in pubkeys { + let amount = thread_rng().gen_range(0, 10); + let account = AccountSharedData::new(amount, 0, AccountSharedData::default().owner()); + accounts.store_slow_uncached(slot, pubkey, &account); + } } } diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index d4d1a3435f0d1a..d8cf74e8b4c725 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -2,7 +2,7 @@ use { super::*, crate::{ - accounts::{create_test_accounts, Accounts}, + accounts::{test_utils::create_test_accounts, Accounts}, accounts_db::{get_temp_accounts_paths, AccountShrinkThreshold}, bank::{Bank, StatusCacheRc}, hardened_unpack::UnpackedAppendVecMap,