Refactors snapshot_archive_info in bank_from_snapshot_archives() (#28776)

This commit is contained in:
Brooks Prumo 2022-11-09 18:41:27 +00:00 committed by GitHub
parent 9e1cdc7e60
commit df81cd11ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions

View File

@ -1019,16 +1019,16 @@ pub fn bank_from_snapshot_archives(
measure_rebuild.stop();
info!("{}", measure_rebuild);
let snapshot_archive_info = incremental_snapshot_archive_info.map_or_else(
|| full_snapshot_archive_info.snapshot_archive_info(),
|incremental_snapshot_archive_info| {
incremental_snapshot_archive_info.snapshot_archive_info()
},
);
verify_bank_against_expected_slot_hash(
&bank,
incremental_snapshot_archive_info.as_ref().map_or(
full_snapshot_archive_info.slot(),
|incremental_snapshot_archive_info| incremental_snapshot_archive_info.slot(),
),
incremental_snapshot_archive_info.as_ref().map_or(
*full_snapshot_archive_info.hash(),
|incremental_snapshot_archive_info| *incremental_snapshot_archive_info.hash(),
),
snapshot_archive_info.slot,
snapshot_archive_info.hash,
)?;
let mut measure_verify = Measure::start("verify");