Refactors snapshot_archive_info in bank_from_snapshot_archives() (#28776)
This commit is contained in:
parent
9e1cdc7e60
commit
df81cd11ba
|
@ -1019,16 +1019,16 @@ pub fn bank_from_snapshot_archives(
|
||||||
measure_rebuild.stop();
|
measure_rebuild.stop();
|
||||||
info!("{}", measure_rebuild);
|
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(
|
verify_bank_against_expected_slot_hash(
|
||||||
&bank,
|
&bank,
|
||||||
incremental_snapshot_archive_info.as_ref().map_or(
|
snapshot_archive_info.slot,
|
||||||
full_snapshot_archive_info.slot(),
|
snapshot_archive_info.hash,
|
||||||
|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(),
|
|
||||||
),
|
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let mut measure_verify = Measure::start("verify");
|
let mut measure_verify = Measure::start("verify");
|
||||||
|
|
Loading…
Reference in New Issue