Minor cleanup on some snapshot related tests (solana-labs#33485)

anza-xyz · Oct 2, 2023 · 3eae980 · 3eae980
1 parent 73e9e6d
commit 3eae980
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/core/src/snapshot_packager_service.rs b/core/src/snapshot_packager_service.rs
@@ -264,7 +264,7 @@ mod tests {
         let bank_snapshot_info =
             snapshot_utils::get_highest_bank_snapshot(&bank_snapshots_dir).unwrap();
         let snapshot_storages = bank.get_snapshot_storages(None);
-        let archive_format = ArchiveFormat::TarBzip2;
+        let archive_format = ArchiveFormat::Tar;
 
         let full_archive = snapshot_bank_utils::package_and_archive_full_snapshot(
             &bank,

diff --git a/download-utils/src/lib.rs b/download-utils/src/lib.rs
@@ -288,7 +288,7 @@ pub fn download_snapshot_archive(
         ArchiveFormat::TarGzip,
         ArchiveFormat::TarBzip2,
         ArchiveFormat::TarLz4,
-        ArchiveFormat::Tar, // `solana-test-validator` creates uncompressed snapshots
+        ArchiveFormat::Tar,
     ] {
         let destination_path = match snapshot_kind {
             SnapshotKind::FullSnapshot => snapshot_utils::build_full_snapshot_archive_path(

diff --git a/rpc/src/rpc_service.rs b/rpc/src/rpc_service.rs
@@ -745,7 +745,9 @@ mod tests {
         assert!(!rrm.is_file_get_path("//genesis.tar.bz2"));
         assert!(!rrm.is_file_get_path("/../genesis.tar.bz2"));
 
-        assert!(!rrm.is_file_get_path("/snapshot.tar.bz2")); // This is a redirect
+        // These two are redirects
+        assert!(!rrm.is_file_get_path("/snapshot.tar.bz2"));
+        assert!(!rrm.is_file_get_path("/incremental-snapshot.tar.bz2"));
 
         assert!(!rrm.is_file_get_path(
             "/snapshot-100-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2"

diff --git a/runtime/src/bank/serde_snapshot.rs b/runtime/src/bank/serde_snapshot.rs
@@ -474,7 +474,7 @@ mod tests {
                 None,
                 full_snapshot_archives_dir.path(),
                 incremental_snapshot_archives_dir.path(),
-                ArchiveFormat::TarBzip2,
+                ArchiveFormat::Tar,
                 NonZeroUsize::new(1).unwrap(),
                 NonZeroUsize::new(1).unwrap(),
             )

diff --git a/runtime/src/snapshot_bank_utils.rs b/runtime/src/snapshot_bank_utils.rs
@@ -1408,7 +1408,7 @@ mod tests {
         let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
         let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
         let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
-        let snapshot_archive_format = ArchiveFormat::TarGzip;
+        let snapshot_archive_format = ArchiveFormat::Tar;
 
         let full_snapshot_archive_info = bank_to_full_snapshot_archive(
             bank_snapshots_dir.path(),