Fail gracefully when keypair file is unreadable

solana-labs · Jul 13, 2018 · 18e6ff4 · 18e6ff4
1 parent fa1cdaa
commit 18e6ff4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/bin/wallet.rs b/src/bin/wallet.rs
@@ -155,7 +155,13 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
         path.extend(&[".config", "solana", "id.json"]);
         path.to_str().unwrap()
     };
-    let id = read_keypair(id_path).expect("client keypair");
+    let id = read_keypair(id_path).or_else(|err| {
+        display_actions();
+        Err(WalletError::BadParameter(format!(
+            "{}: Unable to open keypair file: {}",
+            err, id_path
+        )))
+    })?;
 
     let mut drone_addr = leader.contact_info.tpu;
     drone_addr.set_port(9900);