diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs index da364398c9..d102c93aef 100644 --- a/core/src/accounts_hash_verifier.rs +++ b/core/src/accounts_hash_verifier.rs @@ -109,7 +109,7 @@ impl AccountsHashVerifier { fn verify_accounts_package_hash(accounts_package: &AccountsPackage) { let mut measure_hash = Measure::start("hash"); - if let Some(expected_hash) = accounts_package.hash_for_testing { + if let Some(expected_hash) = accounts_package.accounts_hash_for_testing { let sorted_storages = SortedStorages::new(&accounts_package.snapshot_storages); let (hash, lamports) = accounts_package .accounts @@ -144,7 +144,7 @@ impl AccountsHashVerifier { exit: &Arc, fault_injection_rate_slots: u64, ) { - let hash = accounts_package.hash; + let hash = accounts_package.accounts_hash; if fault_injection_rate_slots != 0 && accounts_package.slot % fault_injection_rate_slots == 0 { @@ -345,12 +345,12 @@ mod tests { slot_deltas: vec![], snapshot_links: TempDir::new().unwrap(), snapshot_storages: vec![], - hash: hash(&[i as u8]), + accounts_hash: hash(&[i as u8]), archive_format: ArchiveFormat::TarBzip2, snapshot_version: SnapshotVersion::default(), snapshot_archives_dir: PathBuf::default(), expected_capitalization: 0, - hash_for_testing: None, + accounts_hash_for_testing: None, cluster_type: ClusterType::MainnetBeta, snapshot_type: None, accounts: Arc::clone(&accounts), diff --git a/runtime/src/snapshot_package.rs b/runtime/src/snapshot_package.rs index 670dcfbbbe..1943b91bcb 100644 --- a/runtime/src/snapshot_package.rs +++ b/runtime/src/snapshot_package.rs @@ -40,12 +40,12 @@ pub struct AccountsPackage { pub slot_deltas: Vec, pub snapshot_links: TempDir, pub snapshot_storages: SnapshotStorages, - pub hash: Hash, // temporarily here while we still have to calculate hash before serializing bank + pub accounts_hash: Hash, // temporarily here while we still have to calculate hash before serializing bank pub archive_format: ArchiveFormat, pub snapshot_version: SnapshotVersion, pub snapshot_archives_dir: PathBuf, pub expected_capitalization: u64, - pub hash_for_testing: Option, + pub accounts_hash_for_testing: Option, pub cluster_type: ClusterType, pub snapshot_type: Option, pub accounts: Arc, @@ -63,7 +63,7 @@ impl AccountsPackage { snapshot_storages: SnapshotStorages, archive_format: ArchiveFormat, snapshot_version: SnapshotVersion, - hash_for_testing: Option, + accounts_hash_for_testing: Option, snapshot_type: Option, ) -> Result { info!( @@ -103,12 +103,12 @@ impl AccountsPackage { slot_deltas, snapshot_links, snapshot_storages, - hash: bank.get_accounts_hash(), + accounts_hash: bank.get_accounts_hash(), archive_format, snapshot_version, snapshot_archives_dir: snapshot_archives_dir.as_ref().to_path_buf(), expected_capitalization: bank.capitalization(), - hash_for_testing, + accounts_hash_for_testing, cluster_type: bank.cluster_type(), snapshot_type, accounts: bank.accounts(), @@ -138,7 +138,7 @@ impl From for SnapshotPackage { SnapshotType::FullSnapshot => snapshot_utils::build_full_snapshot_archive_path( accounts_package.snapshot_archives_dir, accounts_package.slot, - &accounts_package.hash, + &accounts_package.accounts_hash, accounts_package.archive_format, ), SnapshotType::IncrementalSnapshot(incremental_snapshot_base_slot) => { @@ -158,7 +158,7 @@ impl From for SnapshotPackage { accounts_package.snapshot_archives_dir, incremental_snapshot_base_slot, accounts_package.slot, - &accounts_package.hash, + &accounts_package.accounts_hash, accounts_package.archive_format, ) } @@ -168,7 +168,7 @@ impl From for SnapshotPackage { snapshot_archive_info: SnapshotArchiveInfo { path: snapshot_archive_path, slot: accounts_package.slot, - hash: accounts_package.hash, + hash: accounts_package.accounts_hash, archive_format: accounts_package.archive_format, }, block_height: accounts_package.block_height,