From 1f67591e217743ce19f33b310b1ac3ab4e9b5b46 Mon Sep 17 00:00:00 2001
From: Brooks <brooks@solana.com>
Date: Thu, 13 Apr 2023 13:35:35 -0400
Subject: [PATCH] Removes `base` from `IncrementalSnapshotHash` (#31185)

---
 core/src/snapshot_packager_service/snapshot_gossip_manager.rs | 2 +-
 ledger/src/bank_forks_utils.rs                                | 1 -
 runtime/src/snapshot_hash.rs                                  | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/src/snapshot_packager_service/snapshot_gossip_manager.rs b/core/src/snapshot_packager_service/snapshot_gossip_manager.rs
index 8903f31930..2715cd03ed 100644
--- a/core/src/snapshot_packager_service/snapshot_gossip_manager.rs
+++ b/core/src/snapshot_packager_service/snapshot_gossip_manager.rs
@@ -47,7 +47,7 @@ impl SnapshotGossipManager {
         if let Some(starting_incremental_snapshot_hash) = starting_snapshot_hashes.incremental {
             self.update_latest_incremental_snapshot_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();
diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
index 545f64c70a..5ffd387557 100644
--- a/ledger/src/bank_forks_utils.rs
+++ b/ledger/src/bank_forks_utils.rs
@@ -236,7 +236,6 @@ fn bank_forks_from_snapshot(
     let starting_incremental_snapshot_hash =
         incremental_snapshot_archive_info.map(|incremental_snapshot_archive_info| {
             IncrementalSnapshotHash {
-                base: full_snapshot_hash.hash,
                 hash: (
                     incremental_snapshot_archive_info.slot(),
                     *incremental_snapshot_archive_info.hash(),
diff --git a/runtime/src/snapshot_hash.rs b/runtime/src/snapshot_hash.rs
index 2fb95144e6..4b65289570 100644
--- a/runtime/src/snapshot_hash.rs
+++ b/runtime/src/snapshot_hash.rs
@@ -25,11 +25,9 @@ pub struct FullSnapshotHash {
 }
 
 /// 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
-/// this incremental snapshot (`hash`) is based on.
+/// ensure an incremental snapshot hash is pushed to the right CRDS.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct IncrementalSnapshotHash {
-    pub base: (Slot, SnapshotHash),
     pub hash: (Slot, SnapshotHash),
 }