From 478614352495d137da6a132afa16495cfc22555c Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 30 Aug 2019 09:10:22 -0700
Subject: [PATCH] Add a more helpful error on genesis block mismatch (#5744)

automerge
---
 core/src/validator.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index 47e5669d9..cd7613d3b 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -483,10 +483,16 @@ pub fn new_banks_from_blocktree(
 
     if let Some(expected_genesis_blockhash) = expected_genesis_blockhash {
         if genesis_blockhash != expected_genesis_blockhash {
-            panic!(
+            error!(
                 "Genesis blockhash mismatch: expected {} but local genesis blockhash is {}",
                 expected_genesis_blockhash, genesis_blockhash,
             );
+            error!(
+                "Delete the ledger directory to continue: {:?}",
+                blocktree_path
+            );
+            // TODO: bubble error up to caller?
+            std::process::exit(1);
         }
     }