Rename CompressionType to ArchiveFormat

core/src/accounts_hash_verifier.rs

@@ -175,7 +175,7 @@ mod tests {
     use super::*;
     use crate::cluster_info::make_accounts_hashes_message;
     use crate::contact_info::ContactInfo;
-    use solana_runtime::bank_forks::CompressionType;
+    use solana_runtime::bank_forks::ArchiveFormat;
     use solana_runtime::snapshot_utils::SnapshotVersion;
     use solana_sdk::{
         hash::hash,
@@ -239,7 +239,7 @@ mod tests {
                 snapshot_links,
                 tar_output_file: PathBuf::from("."),
                 storages: vec![],
-                compression: CompressionType::Bzip2,
+                archive_format: ArchiveFormat::TarBzip2,
                 snapshot_version: SnapshotVersion::default(),
             };
 

core/src/rpc_service.rs

@@ -439,9 +439,7 @@ mod tests {
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
     };
-    use solana_runtime::{
-        bank::Bank, bank_forks::CompressionType, snapshot_utils::SnapshotVersion,
-    };
+    use solana_runtime::{bank::Bank, bank_forks::ArchiveFormat, snapshot_utils::SnapshotVersion};
     use solana_sdk::{genesis_config::ClusterType, signature::Signer};
     use std::net::{IpAddr, Ipv4Addr};
 
@@ -534,7 +532,7 @@ mod tests {
                 snapshot_interval_slots: 0,
                 snapshot_package_output_path: PathBuf::from("/"),
                 snapshot_path: PathBuf::from("/"),
-                compression: CompressionType::Bzip2,
+                archive_format: ArchiveFormat::TarBzip2,
                 snapshot_version: SnapshotVersion::default(),
             }),
             bank_forks,

core/src/snapshot_packager_service.rs

@@ -81,7 +81,7 @@ mod tests {
     use solana_runtime::{
         accounts_db::AccountStorageEntry,
         bank::BankSlotDelta,
-        bank_forks::CompressionType,
+        bank_forks::ArchiveFormat,
         snapshot_package::AccountsPackage,
         snapshot_utils::{self, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILE_NAME},
     };
@@ -163,7 +163,7 @@ mod tests {
         let output_tar_path = snapshot_utils::get_snapshot_archive_path(
             &snapshot_package_output_path,
             &(42, Hash::default()),
-            &CompressionType::Bzip2,
+            &ArchiveFormat::TarBzip2,
         );
         let snapshot_package = AccountsPackage::new(
             5,
@@ -173,7 +173,7 @@ mod tests {
             vec![storage_entries],
             output_tar_path.clone(),
             Hash::default(),
-            CompressionType::Bzip2,
+            ArchiveFormat::TarBzip2,
             SnapshotVersion::default(),
         );
 
@@ -198,7 +198,7 @@ mod tests {
             output_tar_path,
             snapshots_dir,
             accounts_dir,
-            CompressionType::Bzip2,
+            ArchiveFormat::TarBzip2,
         );
     }
 }

core/src/test_validator.rs

@@ -8,7 +8,7 @@ use {
     solana_client::rpc_client::RpcClient,
     solana_ledger::{blockstore::create_new_ledger, create_new_tmp_ledger},
     solana_runtime::{
-        bank_forks::{CompressionType, SnapshotConfig, SnapshotVersion},
+        bank_forks::{ArchiveFormat, SnapshotConfig, SnapshotVersion},
         genesis_utils::create_genesis_config_with_leader_ex,
         hardened_unpack::MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
     },
@@ -354,7 +354,7 @@ impl TestValidator {
                 snapshot_interval_slots: 100,
                 snapshot_path: ledger_path.join("snapshot"),
                 snapshot_package_output_path: ledger_path.to_path_buf(),
-                compression: CompressionType::NoCompression,
+                archive_format: ArchiveFormat::Tar,
                 snapshot_version: SnapshotVersion::default(),
             }),
             enforce_ulimit_nofile: false,