From ad9855f3327581a4c7f4e871fc690f909a87c47f Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Mon, 2 Dec 2019 13:26:06 +1100
Subject: [PATCH] Tidy, ensure head tracker is loaded from disk

---
 account_manager/src/lib.rs              | 4 +++-
 beacon_node/beacon_chain/src/builder.rs | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/account_manager/src/lib.rs b/account_manager/src/lib.rs
index fdb15a4cb3..37da2146e0 100644
--- a/account_manager/src/lib.rs
+++ b/account_manager/src/lib.rs
@@ -361,6 +361,7 @@ fn deposit_validator(
 
             let log_1 = log.clone();
             let log_2 = log.clone();
+
             web3.eth()
                 .accounts()
                 .map_err(|e| format!("Failed to get accounts: {:?}", e))
@@ -385,7 +386,8 @@ fn deposit_validator(
                                 .then(move |result| match result {
                                     Ok(true) => Ok(from_address),
                                     Ok(false) => {
-                                        Err("Eth1 node refused to unlock account".to_string())
+                                        Err("Eth1 node refused to unlock account. Check password."
+                                            .to_string())
                                     }
                                     Err(e) => Err(format!("Eth1 unlock request failed: {:?}", e)),
                                 });
diff --git a/beacon_node/beacon_chain/src/builder.rs b/beacon_node/beacon_chain/src/builder.rs
index 3066aa096b..c5daafab3e 100644
--- a/beacon_node/beacon_chain/src/builder.rs
+++ b/beacon_node/beacon_chain/src/builder.rs
@@ -10,7 +10,7 @@ use eth1::Config as Eth1Config;
 use lmd_ghost::{LmdGhost, ThreadSafeReducedTree};
 use operation_pool::OperationPool;
 use parking_lot::RwLock;
-use slog::{error, info, Logger};
+use slog::{info, Logger};
 use slot_clock::{SlotClock, TestingSlotClock};
 use std::marker::PhantomData;
 use std::sync::Arc;
@@ -219,9 +219,10 @@ where
 
         self.finalized_checkpoint = Some(p.finalized_checkpoint.clone());
         self.genesis_block_root = Some(p.genesis_block_root);
-        self.head_tracker = HeadTracker::from_ssz_container(&p.ssz_head_tracker)
-            .map_err(|e| error!(log, "Failed to decode head tracker for database: {:?}", e))
-            .ok();
+        self.head_tracker = Some(
+            HeadTracker::from_ssz_container(&p.ssz_head_tracker)
+                .map_err(|e| format!("Failed to decode head tracker for database: {:?}", e))?,
+        );
         self.persisted_beacon_chain = Some(p);
 
         Ok(self)