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

HashCalc uses self.accounts_hash_cache_path (#23882)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2022-03-24 09:31:55 -05:00
committed by GitHub
parent 90009f330b
commit db5d68f01f
5 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/src/accounts_db.rs
View File

@ -5515,7 +5515,6 @@ impl AccountsDb {
};
self.calculate_accounts_hash_without_index(&mut CalcAccountsHashConfig {
accounts_hash_cache_path: &self.accounts_hash_cache_path,
storages: &storages,
use_bg_thread_pool: !is_startup,
stats: timings,
@ -5729,7 +5728,7 @@ impl AccountsDb {
let mut previous_pass = PreviousPass::default();
let mut final_result = (Hash::default(), 0);
let cache_hash_data = CacheHashData::new(&config.accounts_hash_cache_path);
let cache_hash_data = CacheHashData::new(&self.accounts_hash_cache_path);
for pass in 0..num_hash_scan_passes {
let bounds = Range {
@ -7897,7 +7896,6 @@ pub mod tests {
let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
let result = db
.calculate_accounts_hash_without_index(&mut CalcAccountsHashConfig {
accounts_hash_cache_path: TempDir::new().unwrap().path(),
storages: &get_storage_refs(&storages),
use_bg_thread_pool: false,
stats: HashStats::default(),
@ -7924,7 +7922,6 @@ pub mod tests {
let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
let result = db
.calculate_accounts_hash_without_index(&mut CalcAccountsHashConfig {
accounts_hash_cache_path: TempDir::new().unwrap().path(),
storages: &get_storage_refs(&storages),
use_bg_thread_pool: false,
stats: HashStats::default(),

3
runtime/src/accounts_hash.rs
View File

@ -10,7 +10,7 @@ use {
hash::{Hash, Hasher},
pubkey::Pubkey,
},
std::{borrow::Borrow, convert::TryInto, path::Path, sync::Mutex},
std::{borrow::Borrow, convert::TryInto, sync::Mutex},
};
pub const ZERO_RAW_LAMPORTS_SENTINEL: u64 = std::u64::MAX;
pub const MERKLE_FANOUT: usize = 16;
@ -24,7 +24,6 @@ pub struct PreviousPass {
/// parameters to calculate accounts hash
pub struct CalcAccountsHashConfig<'a> {
pub accounts_hash_cache_path: &'a Path,
pub storages: &'a SortedStorages<'a>,
pub use_bg_thread_pool: bool,
pub stats: HashStats,