calculate hash from store instead of index (bp #15034) (#15084)

* calculate hash from store instead of index (#15034)

* calculate hash from store instead of index

* restore update hash in abs

(cherry picked from commit 600ff0d915)

* fix merge conflict (#15085)

Co-authored-by: Jeff Washington (jwash) <75863576+jeffwashington@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2021-02-04 16:58:11 +00:00
committed by GitHub
parent e255ee52b1
commit 36ad03af1f
15 changed files with 691 additions and 61 deletions

View File

@@ -1052,7 +1052,10 @@ fn test_snapshot_download() {
trace!("found: {:?}", archive_filename);
let validator_archive_path = snapshot_utils::get_snapshot_archive_path(
&validator_snapshot_test_config.snapshot_output_path,
validator_snapshot_test_config
.snapshot_output_path
.path()
.to_path_buf(),
&archive_snapshot_hash,
ArchiveFormat::TarBzip2,
);
@@ -1122,7 +1125,10 @@ fn test_snapshot_restart_tower() {
// Copy archive to validator's snapshot output directory
let validator_archive_path = snapshot_utils::get_snapshot_archive_path(
&validator_snapshot_test_config.snapshot_output_path,
validator_snapshot_test_config
.snapshot_output_path
.path()
.to_path_buf(),
&archive_snapshot_hash,
ArchiveFormat::TarBzip2,
);
@@ -1187,7 +1193,10 @@ fn test_snapshots_blockstore_floor() {
// Copy archive to validator's snapshot output directory
let validator_archive_path = snapshot_utils::get_snapshot_archive_path(
&validator_snapshot_test_config.snapshot_output_path,
validator_snapshot_test_config
.snapshot_output_path
.path()
.to_path_buf(),
&(archive_slot, archive_hash),
ArchiveFormat::TarBzip2,
);