From 9767468b7f44329f847bb8b7be12eb41512eac43 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 31 Jan 2019 12:44:09 -0800
Subject: [PATCH] Remove unneeded Option

---
 replicator/src/main.rs |  2 +-
 src/replicator.rs      | 11 +++++------
 tests/replicator.rs    |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/replicator/src/main.rs b/replicator/src/main.rs
index af2deeae6..c7896afed 100644
--- a/replicator/src/main.rs
+++ b/replicator/src/main.rs
@@ -41,7 +41,7 @@ fn main() {
         )
         .get_matches();
 
-    let ledger_path = matches.value_of("ledger");
+    let ledger_path = matches.value_of("ledger").unwrap();
 
     let (keypair, gossip) = if let Some(i) = matches.value_of("identity") {
         let path = i.to_string();
diff --git a/src/replicator.rs b/src/replicator.rs
index 0dab69d63..7f5562a7a 100644
--- a/src/replicator.rs
+++ b/src/replicator.rs
@@ -102,7 +102,7 @@ impl Replicator {
     /// Returns a Result that contains a replicator on success
     ///
     /// # Arguments
-    /// * `ledger_path` - (Not actually optional) path to where the ledger will be stored.
+    /// * `ledger_path` - path to where the ledger will be stored.
     /// Causes panic if none
     /// * `node` - The replicator node
     /// * `leader_info` - NodeInfo representing the leader
@@ -111,7 +111,7 @@ impl Replicator {
     /// 30 seconds
     #[allow(clippy::new_ret_no_self)]
     pub fn new(
-        ledger_path: Option<&str>,
+        ledger_path: &str,
         node: Node,
         leader_info: &NodeInfo,
         keypair: &Keypair,
@@ -138,8 +138,7 @@ impl Replicator {
         // in the ledger located at ledger_path, and will only append on newly received
         // entries after being passed to window_service
         let db_ledger = Arc::new(
-            DbLedger::open(&ledger_path.unwrap())
-                .expect("Expected to be able to open database ledger"),
+            DbLedger::open(ledger_path).expect("Expected to be able to open database ledger"),
         );
 
         let gossip_service = GossipService::new(
@@ -223,9 +222,9 @@ impl Replicator {
         let mut client = mk_client(&leader);
 
         Self::get_airdrop_tokens(&mut client, keypair, &leader_info);
-        info!("Done downloading ledger at {}", ledger_path.unwrap());
+        info!("Done downloading ledger at {}", ledger_path);
 
-        let ledger_path = Path::new(ledger_path.unwrap());
+        let ledger_path = Path::new(ledger_path);
         let ledger_data_file_encrypted = ledger_path.join("ledger.enc");
         let mut sampling_offsets = Vec::new();
 
diff --git a/tests/replicator.rs b/tests/replicator.rs
index 6b4865d24..6060e5523 100644
--- a/tests/replicator.rs
+++ b/tests/replicator.rs
@@ -125,7 +125,7 @@ fn test_replicator_startup() {
         let leader_info = NodeInfo::new_entry_point(&leader_info.gossip);
 
         let replicator = Replicator::new(
-            Some(replicator_ledger_path),
+            replicator_ledger_path,
             replicator_node,
             &leader_info,
             &replicator_keypair,
@@ -237,7 +237,7 @@ fn test_replicator_startup_leader_hang() {
         let leader_info = NodeInfo::new_entry_point(&fake_gossip);
 
         let replicator_res = Replicator::new(
-            Some(replicator_ledger_path),
+            replicator_ledger_path,
             replicator_node,
             &leader_info,
             &replicator_keypair,
@@ -314,7 +314,7 @@ fn test_replicator_startup_ledger_hang() {
         let leader_info = NodeInfo::new_entry_point(&leader_info.gossip);
 
         let replicator_res = Replicator::new(
-            Some(replicator_ledger_path),
+            replicator_ledger_path,
             replicator_node,
             &leader_info,
             &bad_keys,