From e277996b16ba6060c308a4a8c17f11846013d9ec Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Fri, 29 Nov 2019 10:39:40 +1100
Subject: [PATCH] Tidy account manager CLI, add logging

---
 account_manager/src/cli.rs |  1 -
 account_manager/src/lib.rs | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/account_manager/src/cli.rs b/account_manager/src/cli.rs
index 68f22cebda..0b85f4f955 100644
--- a/account_manager/src/cli.rs
+++ b/account_manager/src/cli.rs
@@ -64,7 +64,6 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                                 .long("testnet-dir")
                                 .value_name("DIRECTORY")
                                 .takes_value(true)
-                                .default_value("0")
                                 .help("The directory from which to read the deposit contract address."),
                         )
                         .subcommand(
diff --git a/account_manager/src/lib.rs b/account_manager/src/lib.rs
index e98aaf6f78..1d2d9b0141 100644
--- a/account_manager/src/lib.rs
+++ b/account_manager/src/lib.rs
@@ -179,8 +179,14 @@ fn run_new_validator_subcommand<T: EthSpec>(
                 .parse::<PathBuf>()
                 .map_err(|e| format!("Unable to parse testnet-dir: {}", e))?;
 
-            let eth2_testnet_dir: Eth2TestnetDir<T> = Eth2TestnetDir::load(testnet_dir)
-                .map_err(|e| format!("Failed to load testnet dir: {}", e))?;
+            info!(
+                log,
+                "Loading deposit contract address";
+                "testnet_dir" => format!("{:?}", &testnet_dir)
+            );
+
+            let eth2_testnet_dir: Eth2TestnetDir<T> = Eth2TestnetDir::load(testnet_dir.clone())
+                .map_err(|e| format!("Failed to load testnet dir at {:?}: {}", testnet_dir, e))?;
 
             // Convert from `types::Address` to `web3::types::Address`.
             Address::from_slice(
@@ -191,7 +197,7 @@ fn run_new_validator_subcommand<T: EthSpec>(
         } else {
             matches
                 .value_of("deposit-contract")
-                .ok_or_else(|| "No deposit-contract".to_string())?
+                .ok_or_else(|| "No --deposit-contract or --testnet-dir".to_string())?
                 .parse::<Address>()
                 .map_err(|e| format!("Unable to parse deposit-contract: {}", e))?
         };