codemod --extensions rs get_snapshot_tar_path get_snapshot_archive_path

core/src/snapshot_packager_service.rs

@@ -133,7 +133,8 @@ mod tests {
         }
 
         // Create a packageable snapshot
-        let output_tar_path = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path);
+        let output_tar_path =
+            snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path);
         let snapshot_package = SnapshotPackage::new(
             5,
             vec![],

core/tests/bank_forks.rs

@@ -78,7 +78,7 @@ mod tests {
                 .as_ref()
                 .unwrap()
                 .snapshot_path,
-            snapshot_utils::get_snapshot_tar_path(snapshot_package_output_path),
+            snapshot_utils::get_snapshot_archive_path(snapshot_package_output_path),
         )
         .unwrap();
 
@@ -135,7 +135,9 @@ mod tests {
             slot_snapshot_paths
                 .last()
                 .expect("no snapshots found in path"),
-            snapshot_utils::get_snapshot_tar_path(&snapshot_config.snapshot_package_output_path),
+            snapshot_utils::get_snapshot_archive_path(
+                &snapshot_config.snapshot_package_output_path,
+            ),
             &snapshot_config.snapshot_path,
             &last_bank.src.roots(),
         )

ledger/src/bank_forks.rs

@@ -192,7 +192,7 @@ impl BankForks {
                     root,
                     &root_bank.src.roots(),
                     snapshot_package_sender.as_ref().unwrap(),
-                    snapshot_utils::get_snapshot_tar_path(&config.snapshot_package_output_path),
+                    snapshot_utils::get_snapshot_archive_path(&config.snapshot_package_output_path),
                 );
                 if r.is_err() {
                     warn!("Error generating snapshot for bank: {}, err: {:?}", root, r);

ledger/src/bank_forks_utils.rs

@@ -26,8 +26,9 @@ pub fn load(
         fs::create_dir_all(&snapshot_config.snapshot_path)
             .expect("Couldn't create snapshot directory");
 
-        let tar =
+        let tar = snapshot_utils::get_snapshot_archive_path(
-            snapshot_utils::get_snapshot_tar_path(&snapshot_config.snapshot_package_output_path);
+            &snapshot_config.snapshot_package_output_path,
+        );
         if tar.exists() {
             info!("Loading snapshot package: {:?}", tar);
             // Fail hard here if snapshot fails to load, don't silently continue

ledger/src/snapshot_utils.rs

@@ -481,7 +481,7 @@ pub fn bank_from_archive<P: AsRef<Path>>(
     Ok(bank)
 }
 
-pub fn get_snapshot_tar_path<P: AsRef<Path>>(snapshot_output_dir: P) -> PathBuf {
+pub fn get_snapshot_archive_path<P: AsRef<Path>>(snapshot_output_dir: P) -> PathBuf {
     snapshot_output_dir.as_ref().join("snapshot.tar.bz2")
 }
 

local-cluster/tests/local_cluster.rs

@@ -651,12 +651,13 @@ fn test_snapshot_restart_tower() {
         .as_ref()
         .unwrap()
         .snapshot_package_output_path;
-    let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path);
+    let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path);
     wait_for_next_snapshot(&cluster, &tar);
 
     // Copy tar to validator's snapshot output directory
-    let validator_tar_path =
+    let validator_tar_path = snapshot_utils::get_snapshot_archive_path(
-        snapshot_utils::get_snapshot_tar_path(&validator_snapshot_test_config.snapshot_output_path);
+        &validator_snapshot_test_config.snapshot_output_path,
+    );
     fs::hard_link(tar, &validator_tar_path).unwrap();
 
     // Restart validator from snapshot, the validator's tower state in this snapshot
@@ -702,7 +703,7 @@ fn test_snapshots_blockstore_floor() {
 
     trace!("Waiting for snapshot tar to be generated with slot",);
 
-    let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path);
+    let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path);
     loop {
         if tar.exists() {
             trace!("snapshot tar exists");
@@ -712,8 +713,9 @@ fn test_snapshots_blockstore_floor() {
     }
 
     // Copy tar to validator's snapshot output directory
-    let validator_tar_path =
+    let validator_tar_path = snapshot_utils::get_snapshot_archive_path(
-        snapshot_utils::get_snapshot_tar_path(&validator_snapshot_test_config.snapshot_output_path);
+        &validator_snapshot_test_config.snapshot_output_path,
+    );
     fs::hard_link(tar, &validator_tar_path).unwrap();
     let slot_floor = snapshot_utils::bank_slot_from_archive(&validator_tar_path).unwrap();
 
@@ -803,7 +805,7 @@ fn test_snapshots_restart_validity() {
 
         expected_balances.extend(new_balances);
 
-        let tar = snapshot_utils::get_snapshot_tar_path(&snapshot_package_output_path);
+        let tar = snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path);
         wait_for_next_snapshot(&cluster, &tar);
 
         // Create new account paths since validator exit is not guaranteed to cleanup RPC threads,

validator/src/main.rs

@@ -323,7 +323,8 @@ fn download_ledger(
     download_tar_bz2(rpc_addr, "genesis.tar.bz2", ledger_path, false)?;
 
     if !no_snapshot_fetch {
-        let snapshot_package = solana_ledger::snapshot_utils::get_snapshot_tar_path(ledger_path);
+        let snapshot_package =
+            solana_ledger::snapshot_utils::get_snapshot_archive_path(ledger_path);
         if snapshot_package.exists() {
             fs::remove_file(&snapshot_package)
                 .map_err(|err| format!("error removing {:?}: {}", snapshot_package, err))?;