From 2059af822d6f493517b0e1136603154af04702fb Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 25 Feb 2020 00:27:19 -0700
Subject: [PATCH] Remove unnecessary new_banks_from_blockstore() argument
 (#8433)

automerge
---
 core/src/validator.rs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index 4468f1426..16bda05a2 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -167,12 +167,7 @@ impl Validator {
             completed_slots_receiver,
             leader_schedule_cache,
             snapshot_hash,
-        ) = new_banks_from_blockstore(
-            config.expected_genesis_hash,
-            ledger_path,
-            poh_verify,
-            config,
-        );
+        ) = new_banks_from_blockstore(config, ledger_path, poh_verify);
 
         let leader_schedule_cache = Arc::new(leader_schedule_cache);
         let exit = Arc::new(AtomicBool::new(false));
@@ -545,10 +540,9 @@ impl Validator {
 
 #[allow(clippy::type_complexity)]
 fn new_banks_from_blockstore(
-    expected_genesis_hash: Option<Hash>,
+    config: &ValidatorConfig,
     blockstore_path: &Path,
     poh_verify: bool,
-    config: &ValidatorConfig,
 ) -> (
     GenesisConfig,
     BankForks,
@@ -574,7 +568,7 @@ fn new_banks_from_blockstore(
     let genesis_hash = genesis_config.hash();
     info!("genesis hash: {}", genesis_hash);
 
-    if let Some(expected_genesis_hash) = expected_genesis_hash {
+    if let Some(expected_genesis_hash) = config.expected_genesis_hash {
         if genesis_hash != expected_genesis_hash {
             error!("genesis hash mismatch: expected {}", expected_genesis_hash);
             error!(