remove bank_test_config_caching_enabled (#29170)
This commit is contained in:
parent
151727f633
commit
ec5098a723
|
@ -14,7 +14,7 @@ use {
|
||||||
accounts_db::AccountShrinkThreshold,
|
accounts_db::AccountShrinkThreshold,
|
||||||
accounts_hash::CalcAccountsHashConfig,
|
accounts_hash::CalcAccountsHashConfig,
|
||||||
accounts_index::AccountSecondaryIndexes,
|
accounts_index::AccountSecondaryIndexes,
|
||||||
bank::{bank_test_config_caching_enabled, Bank},
|
bank::{Bank, BankTestConfig},
|
||||||
bank_forks::BankForks,
|
bank_forks::BankForks,
|
||||||
epoch_accounts_hash::{self, EpochAccountsHash},
|
epoch_accounts_hash::{self, EpochAccountsHash},
|
||||||
genesis_utils::{self, GenesisConfigInfo},
|
genesis_utils::{self, GenesisConfigInfo},
|
||||||
|
@ -109,7 +109,7 @@ impl TestEnvironment {
|
||||||
|
|
||||||
let mut bank_forks = BankForks::new(Bank::new_for_tests_with_config(
|
let mut bank_forks = BankForks::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config_info.genesis_config,
|
&genesis_config_info.genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
));
|
));
|
||||||
bank_forks.set_snapshot_config(Some(snapshot_config.clone()));
|
bank_forks.set_snapshot_config(Some(snapshot_config.clone()));
|
||||||
bank_forks.set_accounts_hash_interval_slots(Self::ACCOUNTS_HASH_INTERVAL);
|
bank_forks.set_accounts_hash_interval_slots(Self::ACCOUNTS_HASH_INTERVAL);
|
||||||
|
|
|
@ -1154,13 +1154,6 @@ pub struct BankTestConfig {
|
||||||
pub accounts_db_caching_enabled: bool,
|
pub accounts_db_caching_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn bank_test_config_caching_enabled() -> BankTestConfig {
|
|
||||||
BankTestConfig {
|
|
||||||
accounts_db_caching_enabled: true,
|
|
||||||
..BankTestConfig::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct PrevEpochInflationRewards {
|
struct PrevEpochInflationRewards {
|
||||||
validator_rewards: u64,
|
validator_rewards: u64,
|
||||||
|
@ -10471,7 +10464,7 @@ pub(crate) mod tests {
|
||||||
let amount = genesis_config.rent.minimum_balance(0);
|
let amount = genesis_config.rent.minimum_balance(0);
|
||||||
let parent = Arc::new(Bank::new_for_tests_with_config(
|
let parent = Arc::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
));
|
));
|
||||||
let mut bank = parent;
|
let mut bank = parent;
|
||||||
for _ in 0..10 {
|
for _ in 0..10 {
|
||||||
|
@ -12053,7 +12046,7 @@ pub(crate) mod tests {
|
||||||
activate_all_features(&mut genesis_config);
|
activate_all_features(&mut genesis_config);
|
||||||
let bank1 = Arc::new(Bank::new_for_tests_with_config(
|
let bank1 = Arc::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
));
|
));
|
||||||
if pass == 0 {
|
if pass == 0 {
|
||||||
add_root_and_flush_write_cache(&bank1);
|
add_root_and_flush_write_cache(&bank1);
|
||||||
|
@ -15301,7 +15294,7 @@ pub(crate) mod tests {
|
||||||
let bank = Arc::new(Bank::new_from_parent(
|
let bank = Arc::new(Bank::new_from_parent(
|
||||||
&Arc::new(Bank::new_for_tests_with_config(
|
&Arc::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
)),
|
)),
|
||||||
&Pubkey::default(),
|
&Pubkey::default(),
|
||||||
slot,
|
slot,
|
||||||
|
@ -15344,10 +15337,7 @@ pub(crate) mod tests {
|
||||||
// and then want to continue modifying the bank
|
// and then want to continue modifying the bank
|
||||||
for pass in 0..4 {
|
for pass in 0..4 {
|
||||||
let (genesis_config, mint_keypair) = create_genesis_config(100_000);
|
let (genesis_config, mint_keypair) = create_genesis_config(100_000);
|
||||||
let bank = Bank::new_for_tests_with_config(
|
let bank = Bank::new_for_tests_with_config(&genesis_config, BankTestConfig::default());
|
||||||
&genesis_config,
|
|
||||||
bank_test_config_caching_enabled(),
|
|
||||||
);
|
|
||||||
let program_id = solana_sdk::pubkey::new_rand();
|
let program_id = solana_sdk::pubkey::new_rand();
|
||||||
|
|
||||||
bank.add_precompiled_account(&program_id);
|
bank.add_precompiled_account(&program_id);
|
||||||
|
@ -15381,10 +15371,7 @@ pub(crate) mod tests {
|
||||||
fn test_add_precompiled_account_squatted_while_not_replacing() {
|
fn test_add_precompiled_account_squatted_while_not_replacing() {
|
||||||
for pass in 0..3 {
|
for pass in 0..3 {
|
||||||
let (genesis_config, mint_keypair) = create_genesis_config(100_000);
|
let (genesis_config, mint_keypair) = create_genesis_config(100_000);
|
||||||
let bank = Bank::new_for_tests_with_config(
|
let bank = Bank::new_for_tests_with_config(&genesis_config, BankTestConfig::default());
|
||||||
&genesis_config,
|
|
||||||
bank_test_config_caching_enabled(),
|
|
||||||
);
|
|
||||||
let program_id = solana_sdk::pubkey::new_rand();
|
let program_id = solana_sdk::pubkey::new_rand();
|
||||||
|
|
||||||
// someone managed to squat at program_id!
|
// someone managed to squat at program_id!
|
||||||
|
|
|
@ -7,7 +7,7 @@ use {
|
||||||
accounts_db::{get_temp_accounts_paths, AccountShrinkThreshold, AccountStorageMap},
|
accounts_db::{get_temp_accounts_paths, AccountShrinkThreshold, AccountStorageMap},
|
||||||
accounts_hash::AccountsHash,
|
accounts_hash::AccountsHash,
|
||||||
append_vec::AppendVec,
|
append_vec::AppendVec,
|
||||||
bank::{bank_test_config_caching_enabled, Bank, Rewrites},
|
bank::{Bank, BankTestConfig, Rewrites},
|
||||||
epoch_accounts_hash,
|
epoch_accounts_hash,
|
||||||
genesis_utils::{self, activate_all_features, activate_feature},
|
genesis_utils::{self, activate_all_features, activate_feature},
|
||||||
snapshot_utils::ArchiveFormat,
|
snapshot_utils::ArchiveFormat,
|
||||||
|
@ -507,7 +507,7 @@ fn test_extra_fields_eof() {
|
||||||
|
|
||||||
let bank0 = Arc::new(Bank::new_for_tests_with_config(
|
let bank0 = Arc::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
));
|
));
|
||||||
bank0.squash();
|
bank0.squash();
|
||||||
let mut bank = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
|
let mut bank = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
|
||||||
|
@ -636,7 +636,7 @@ fn test_blank_extra_fields() {
|
||||||
|
|
||||||
let bank0 = Arc::new(Bank::new_for_tests_with_config(
|
let bank0 = Arc::new(Bank::new_for_tests_with_config(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
bank_test_config_caching_enabled(),
|
BankTestConfig::default(),
|
||||||
));
|
));
|
||||||
bank0.squash();
|
bank0.squash();
|
||||||
let mut bank = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
|
let mut bank = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
|
||||||
|
|
Loading…
Reference in New Issue