Revert "Pass SnapshotConfig to SnapshotPackagerService (solana-labs#1…

…9616)" This reverts commit b93c021.
identity-com · Nov 24, 2021 · d7fe0ec · d7fe0ec
1 parent f77b1eb
commit d7fe0ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/core/src/snapshot_packager_service.rs b/core/src/snapshot_packager_service.rs
@@ -1,7 +1,7 @@
 use solana_gossip::cluster_info::{ClusterInfo, MAX_SNAPSHOT_HASHES};
 use solana_runtime::{
-    snapshot_archive_info::SnapshotArchiveInfoGetter, snapshot_config::SnapshotConfig,
-    snapshot_package::PendingSnapshotPackage, snapshot_utils,
+    snapshot_archive_info::SnapshotArchiveInfoGetter, snapshot_package::PendingSnapshotPackage,
+    snapshot_utils,
 };
 use solana_sdk::{clock::Slot, hash::Hash};
 use std::{
@@ -23,7 +23,7 @@ impl SnapshotPackagerService {
         starting_snapshot_hash: Option<(Slot, Hash)>,
         exit: &Arc<AtomicBool>,
         cluster_info: &Arc<ClusterInfo>,
-        snapshot_config: SnapshotConfig,
+        maximum_snapshots_to_retain: usize,
     ) -> Self {
         let exit = exit.clone();
         let cluster_info = cluster_info.clone();
@@ -53,7 +53,7 @@ impl SnapshotPackagerService {
                     // last_full_snapshot_slot that requires this archive call to succeed.
                     snapshot_utils::archive_snapshot_package(
                         &snapshot_package,
-                        snapshot_config.maximum_full_snapshot_archives_to_retain,
+                        maximum_snapshots_to_retain,
                     )
                     .expect("failed to archive snapshot package");
 

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -651,7 +651,7 @@ impl Validator {
                     snapshot_hash,
                     &exit,
                     &cluster_info,
-                    snapshot_config.clone(),
+                    snapshot_config.maximum_full_snapshot_archives_to_retain,
                 );
                 (
                     Some(snapshot_packager_service),

diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs
@@ -505,7 +505,7 @@ mod tests {
             None,
             &exit,
             &cluster_info,
-            snapshot_config.clone(),
+            DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN,
         );
 
         let _package_receiver = std::thread::Builder::new()
@@ -926,7 +926,9 @@ mod tests {
             None,
             &exit,
             &cluster_info,
-            snapshot_test_config.snapshot_config.clone(),
+            snapshot_test_config
+                .snapshot_config
+                .maximum_full_snapshot_archives_to_retain,
         );
 
         let accounts_hash_verifier = AccountsHashVerifier::new(