From 220aa6ada035c53bb7e9fe9a7d3725f27da95982 Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Fri, 28 Jan 2022 14:21:15 +0800
Subject: [PATCH] Fix poh recorder initialization on startup (#22755)

---
 core/src/validator.rs | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index da28ded37a..1da352f946 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -575,29 +575,25 @@ impl Validator {
         );
 
         let poh_config = Arc::new(genesis_config.poh_config.clone());
-        let (mut poh_recorder, entry_receiver, record_receiver) =
-            PohRecorder::new_with_clear_signal(
-                bank.tick_height(),
-                bank.last_blockhash(),
-                bank.clone(),
-                leader_schedule_cache.next_leader_slot(
-                    &id,
-                    bank.slot(),
-                    &bank,
-                    Some(&blockstore),
-                    GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
-                ),
-                bank.ticks_per_slot(),
+        let (poh_recorder, entry_receiver, record_receiver) = PohRecorder::new_with_clear_signal(
+            bank.tick_height(),
+            bank.last_blockhash(),
+            bank.clone(),
+            leader_schedule_cache.next_leader_slot(
                 &id,
-                &blockstore,
-                blockstore.new_shreds_signals.first().cloned(),
-                &leader_schedule_cache,
-                &poh_config,
-                exit.clone(),
-            );
-        if config.snapshot_config.is_some() {
-            poh_recorder.set_bank(&bank);
-        }
+                bank.slot(),
+                &bank,
+                Some(&blockstore),
+                GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
+            ),
+            bank.ticks_per_slot(),
+            &id,
+            &blockstore,
+            blockstore.new_shreds_signals.first().cloned(),
+            &leader_schedule_cache,
+            &poh_config,
+            exit.clone(),
+        );
         let poh_recorder = Arc::new(Mutex::new(poh_recorder));
 
         let rpc_override_health_check = Arc::new(AtomicBool::new(false));