From 49c94fad60dbfe66c13f4ce6ebb198d14ecc139a Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 23 Jan 2020 01:39:35 -0700
Subject: [PATCH] add_snapshot now returns SlotSnapshotPaths

---
 ledger/src/snapshot_package.rs |  1 +
 ledger/src/snapshot_utils.rs   | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ledger/src/snapshot_package.rs b/ledger/src/snapshot_package.rs
index d4bbacdb17..212393f120 100644
--- a/ledger/src/snapshot_package.rs
+++ b/ledger/src/snapshot_package.rs
@@ -10,6 +10,7 @@ pub type SnapshotPackageSender = Sender<SnapshotPackage>;
 pub type SnapshotPackageReceiver = Receiver<SnapshotPackage>;
 pub type SnapshotPackageSendError = SendError<SnapshotPackage>;
 
+#[derive(Debug)]
 pub struct SnapshotPackage {
     pub root: u64,
     pub slot_deltas: Vec<SlotDelta<TransactionResult<()>>>,
diff --git a/ledger/src/snapshot_utils.rs b/ledger/src/snapshot_utils.rs
index b3c7544159..e0df599719 100644
--- a/ledger/src/snapshot_utils.rs
+++ b/ledger/src/snapshot_utils.rs
@@ -139,7 +139,7 @@ where
     }
 }
 
-pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()> {
+pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<SlotSnapshotPaths> {
     bank.purge_zero_lamport_accounts();
     let slot = bank.slot();
     // snapshot_path/slot
@@ -148,11 +148,7 @@ pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()>
 
     // the snapshot is stored as snapshot_path/slot/slot
     let snapshot_file_path = slot_snapshot_dir.join(get_snapshot_file_name(slot));
-    info!(
-        "creating snapshot {}, path: {:?}",
-        bank.slot(),
-        snapshot_file_path,
-    );
+    info!("Creating snapshot {}, path: {:?}", slot, snapshot_file_path);
 
     let snapshot_file = File::create(&snapshot_file_path)?;
     // snapshot writer
@@ -166,12 +162,13 @@ pub fn add_snapshot<P: AsRef<Path>>(snapshot_path: P, bank: &Bank) -> Result<()>
 
     info!(
         "{} for slot {} at {:?}",
-        bank_rc_serialize,
-        bank.slot(),
-        snapshot_file_path,
+        bank_rc_serialize, slot, snapshot_file_path,
     );
 
-    Ok(())
+    Ok(SlotSnapshotPaths {
+        slot,
+        snapshot_file_path,
+    })
 }
 
 pub fn remove_snapshot<P: AsRef<Path>>(slot: Slot, snapshot_path: P) -> Result<()> {