Removes `base` from `IncrementalSnapshotHash` (#31185)
This commit is contained in:
parent
e05957d8fa
commit
1f67591e21
|
@ -47,7 +47,7 @@ impl SnapshotGossipManager {
|
||||||
if let Some(starting_incremental_snapshot_hash) = starting_snapshot_hashes.incremental {
|
if let Some(starting_incremental_snapshot_hash) = starting_snapshot_hashes.incremental {
|
||||||
self.update_latest_incremental_snapshot_hash(
|
self.update_latest_incremental_snapshot_hash(
|
||||||
starting_incremental_snapshot_hash.hash,
|
starting_incremental_snapshot_hash.hash,
|
||||||
starting_incremental_snapshot_hash.base.0,
|
starting_snapshot_hashes.full.hash.0,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
self.push_latest_snapshot_hashes_to_cluster();
|
self.push_latest_snapshot_hashes_to_cluster();
|
||||||
|
|
|
@ -236,7 +236,6 @@ fn bank_forks_from_snapshot(
|
||||||
let starting_incremental_snapshot_hash =
|
let starting_incremental_snapshot_hash =
|
||||||
incremental_snapshot_archive_info.map(|incremental_snapshot_archive_info| {
|
incremental_snapshot_archive_info.map(|incremental_snapshot_archive_info| {
|
||||||
IncrementalSnapshotHash {
|
IncrementalSnapshotHash {
|
||||||
base: full_snapshot_hash.hash,
|
|
||||||
hash: (
|
hash: (
|
||||||
incremental_snapshot_archive_info.slot(),
|
incremental_snapshot_archive_info.slot(),
|
||||||
*incremental_snapshot_archive_info.hash(),
|
*incremental_snapshot_archive_info.hash(),
|
||||||
|
|
|
@ -25,11 +25,9 @@ pub struct FullSnapshotHash {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Used by SnapshotPackagerService and SnapshotGossipManager, this struct adds type safety to
|
/// Used by SnapshotPackagerService and SnapshotGossipManager, this struct adds type safety to
|
||||||
/// ensure an incremental snapshot hash is pushed to the right CRDS. `base` is the (full) snapshot
|
/// ensure an incremental snapshot hash is pushed to the right CRDS.
|
||||||
/// this incremental snapshot (`hash`) is based on.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub struct IncrementalSnapshotHash {
|
pub struct IncrementalSnapshotHash {
|
||||||
pub base: (Slot, SnapshotHash),
|
|
||||||
pub hash: (Slot, SnapshotHash),
|
pub hash: (Slot, SnapshotHash),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue