Removes full_snapshot from CalcAccountsHashConfig (#29722)

solana-labs · Jan 16, 2023 · 0db14ad · 0db14ad
1 parent ef30083
commit 0db14ad
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 19 deletions.
diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
@@ -233,7 +233,6 @@ impl AccountsHashVerifier {
                     epoch_schedule: &accounts_package.epoch_schedule,
                     rent_collector: &accounts_package.rent_collector,
                     store_detailed_debug_info_on_failure: false,
-                    full_snapshot: None,
                 },
                 &sorted_storages,
                 timings,
@@ -255,7 +254,6 @@ impl AccountsHashVerifier {
                         epoch_schedule: &accounts_package.epoch_schedule,
                         rent_collector: &accounts_package.rent_collector,
                         store_detailed_debug_info_on_failure: false,
-                        full_snapshot: None,
                     },
                 );
             info!(
@@ -274,7 +272,6 @@ impl AccountsHashVerifier {
                         rent_collector: &accounts_package.rent_collector,
                         // now that we've failed, store off the failing contents that produced a bad capitalization
                         store_detailed_debug_info_on_failure: true,
-                        full_snapshot: None,
                     },
                     &sorted_storages,
                     HashStats::default(),

diff --git a/core/tests/epoch_accounts_hash.rs b/core/tests/epoch_accounts_hash.rs
@@ -323,7 +323,6 @@ fn test_epoch_accounts_hash_basic(test_environment: TestEnvironment) {
                         epoch_schedule: bank.epoch_schedule(),
                         rent_collector: bank.rent_collector(),
                         store_detailed_debug_info_on_failure: false,
-                        full_snapshot: None,
                     },
                 )
                 .unwrap();

diff --git a/runtime/src/accounts_background_service.rs b/runtime/src/accounts_background_service.rs
@@ -331,7 +331,6 @@ impl SnapshotRequestHandler {
                         epoch_schedule: snapshot_root_bank.epoch_schedule(),
                         rent_collector: snapshot_root_bank.rent_collector(),
                         store_detailed_debug_info_on_failure: false,
-                        full_snapshot: None,
                     },
                 )
                 .unwrap();

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -7097,7 +7097,6 @@ impl AccountsDb {
                     epoch_schedule,
                     rent_collector,
                     store_detailed_debug_info_on_failure: false,
-                    full_snapshot: None,
                 },
                 expected_capitalization,
             )
@@ -7386,7 +7385,6 @@ impl AccountsDb {
                     epoch_schedule,
                     rent_collector,
                     store_detailed_debug_info_on_failure: store_hash_raw_data_for_debug,
-                    full_snapshot: None,
                 },
                 None,
             )?;
@@ -12084,7 +12082,6 @@ pub mod tests {
                 epoch_schedule: &EPOCH_SCHEDULE,
                 rent_collector: &RENT_COLLECTOR,
                 store_detailed_debug_info_on_failure: false,
-                full_snapshot: None,
             }
         }
     }

diff --git a/runtime/src/accounts_hash.rs b/runtime/src/accounts_hash.rs
@@ -95,15 +95,6 @@ impl AccountHashesFile {
     }
 }
 
-#[derive(Debug)]
-#[allow(dead_code)]
-pub struct FullSnapshotAccountsHashInfo {
-    /// accounts hash over all accounts when the full snapshot was taken
-    hash: AccountsHash,
-    /// slot where full snapshot was taken
-    slot: Slot,
-}
-
 /// parameters to calculate accounts hash
 #[derive(Debug)]
 pub struct CalcAccountsHashConfig<'a> {
@@ -120,8 +111,6 @@ pub struct CalcAccountsHashConfig<'a> {
     pub rent_collector: &'a RentCollector,
     /// used for tracking down hash mismatches after the fact
     pub store_detailed_debug_info_on_failure: bool,
-    /// `Some` if this is an incremental snapshot which only hashes slots since the base full snapshot
-    pub full_snapshot: Option<FullSnapshotAccountsHashInfo>,
 }
 
 impl<'a> CalcAccountsHashConfig<'a> {