From f136d38543d66912818ce72962ad7965d47e752e Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Fri, 17 Jan 2020 09:13:34 +1100
Subject: [PATCH] Add more detail to best node error

---
 eth2/proto_array_fork_choice/src/error.rs       | 6 ++++--
 eth2/proto_array_fork_choice/src/proto_array.rs | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eth2/proto_array_fork_choice/src/error.rs b/eth2/proto_array_fork_choice/src/error.rs
index ee1e58f5df..11265aa362 100644
--- a/eth2/proto_array_fork_choice/src/error.rs
+++ b/eth2/proto_array_fork_choice/src/error.rs
@@ -23,9 +23,11 @@ pub enum Error {
         new_finalized_epoch: Epoch,
     },
     InvalidBestNode {
+        start_root: Hash256,
         justified_epoch: Epoch,
         finalized_epoch: Epoch,
-        node_justified_epoch: Epoch,
-        node_finalized_epoch: Epoch,
+        head_root: Hash256,
+        head_justified_epoch: Epoch,
+        head_finalized_epoch: Epoch,
     },
 }
diff --git a/eth2/proto_array_fork_choice/src/proto_array.rs b/eth2/proto_array_fork_choice/src/proto_array.rs
index facd602144..587818d78d 100644
--- a/eth2/proto_array_fork_choice/src/proto_array.rs
+++ b/eth2/proto_array_fork_choice/src/proto_array.rs
@@ -186,15 +186,15 @@ impl ProtoArray {
         // the filter.
         if !self.node_is_viable_for_head(&best_node) {
             return Err(Error::InvalidBestNode {
+                start_root: *justified_root,
                 justified_epoch: self.justified_epoch,
                 finalized_epoch: self.finalized_epoch,
-                node_justified_epoch: justified_node.justified_epoch,
-                node_finalized_epoch: justified_node.finalized_epoch,
+                head_root: justified_node.root,
+                head_justified_epoch: justified_node.justified_epoch,
+                head_finalized_epoch: justified_node.finalized_epoch,
             });
         }
 
-        // dbg!(&self.nodes);
-
         Ok(best_node.root)
     }