CalcAccountsHashConfig default for tests (#26810)

This commit is contained in:
Jeff Washington (jwash) 2022-07-27 13:21:38 -05:00 committed by GitHub
parent ecc5b65784
commit 1a5b830294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 45 deletions

View File

@ -9056,13 +9056,8 @@ pub mod tests {
bins, bins,
bin_range, bin_range,
&CalcAccountsHashConfig { &CalcAccountsHashConfig {
use_bg_thread_pool: false,
check_hash, check_hash,
ancestors: None, ..CalcAccountsHashConfig::default()
use_write_cache: false,
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
}, },
None, None,
) )
@ -9445,15 +9440,7 @@ pub mod tests {
let db = AccountsDb::new(Vec::new(), &ClusterType::Development); let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
let result = db let result = db
.calculate_accounts_hash_without_index( .calculate_accounts_hash_without_index(
&CalcAccountsHashConfig { &CalcAccountsHashConfig::default(),
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
use_write_cache: false,
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
},
&get_storage_refs(&storages), &get_storage_refs(&storages),
HashStats::default(), HashStats::default(),
) )
@ -9475,15 +9462,7 @@ pub mod tests {
let db = AccountsDb::new(Vec::new(), &ClusterType::Development); let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
let result = db let result = db
.calculate_accounts_hash_without_index( .calculate_accounts_hash_without_index(
&CalcAccountsHashConfig { &CalcAccountsHashConfig::default(),
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
use_write_cache: false,
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
},
&get_storage_refs(&storages), &get_storage_refs(&storages),
HashStats::default(), HashStats::default(),
) )
@ -9586,15 +9565,7 @@ pub mod tests {
let result = accounts_db.scan_account_storage_no_bank( let result = accounts_db.scan_account_storage_no_bank(
&CacheHashData::new(&accounts_hash_cache_path), &CacheHashData::new(&accounts_hash_cache_path),
&CalcAccountsHashConfig { &CalcAccountsHashConfig::default(),
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
use_write_cache: false,
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
},
&get_storage_refs(&storages), &get_storage_refs(&storages),
test_scan, test_scan,
&Range { start: 0, end: 1 }, &Range { start: 0, end: 1 },
@ -11632,16 +11603,33 @@ pub mod tests {
use_bg_thread_pool: true, // is_startup used to be false use_bg_thread_pool: true, // is_startup used to be false
check_hash, check_hash,
ancestors: Some(&ancestors), ancestors: Some(&ancestors),
use_write_cache: false, ..CalcAccountsHashConfig::default()
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
}, },
) )
.is_err()); .is_err());
} }
} }
// something we can get a ref to
lazy_static! {
pub static ref EPOCH_SCHEDULE: EpochSchedule = EpochSchedule::default();
pub static ref RENT_COLLECTOR: RentCollector = RentCollector::default();
}
impl<'a> CalcAccountsHashConfig<'a> {
fn default() -> Self {
Self {
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
use_write_cache: false,
epoch_schedule: &EPOCH_SCHEDULE,
rent_collector: &RENT_COLLECTOR,
store_detailed_debug_info_on_failure: false,
}
}
}
#[test] #[test]
fn test_calculate_accounts_hash_check_hash() { fn test_calculate_accounts_hash_check_hash() {
solana_logger::setup(); solana_logger::setup();
@ -11665,10 +11653,7 @@ pub mod tests {
use_bg_thread_pool: true, // is_startup used to be false use_bg_thread_pool: true, // is_startup used to be false
check_hash, check_hash,
ancestors: Some(&ancestors), ancestors: Some(&ancestors),
use_write_cache: false, ..CalcAccountsHashConfig::default()
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
}, },
) )
.unwrap(), .unwrap(),
@ -11679,10 +11664,7 @@ pub mod tests {
use_bg_thread_pool: true, // is_startup used to be false use_bg_thread_pool: true, // is_startup used to be false
check_hash, check_hash,
ancestors: Some(&ancestors), ancestors: Some(&ancestors),
use_write_cache: false, ..CalcAccountsHashConfig::default()
epoch_schedule: &EpochSchedule::default(),
rent_collector: &RentCollector::default(),
store_detailed_debug_info_on_failure: false,
}, },
) )
.unwrap(), .unwrap(),