From 1ff236a95a806f05f796d11c5648a7e579cf9e98 Mon Sep 17 00:00:00 2001
From: Carl Lin <carl@solana.com>
Date: Tue, 15 Feb 2022 01:57:27 -0500
Subject: [PATCH] Revert logging

---
 core/src/replay_stage.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
index 4bd8e5c28c..f034beed45 100644
--- a/core/src/replay_stage.rs
+++ b/core/src/replay_stage.rs
@@ -407,7 +407,6 @@ impl ReplayStage {
                     let mut generate_new_bank_forks_time =
                         Measure::start("generate_new_bank_forks_time");
                     Self::generate_new_bank_forks(
-                        &my_pubkey,
                         &blockstore,
                         &bank_forks,
                         &leader_schedule_cache,
@@ -647,9 +646,8 @@ impl ReplayStage {
                     // Reset onto a fork
                     if let Some(reset_bank) = reset_bank {
                         if last_reset != reset_bank.last_blockhash() {
-                            println!(
-                                "{} vote bank: {:?} reset bank: {:?}",
-                                my_pubkey,
+                            info!(
+                                "vote bank: {:?} reset bank: {:?}",
                                 vote_bank.as_ref().map(|(b, switch_fork_decision)| (
                                     b.slot(),
                                     switch_fork_decision
@@ -1217,9 +1215,9 @@ impl ReplayStage {
 
             let root_slot = bank_forks.read().unwrap().root();
             datapoint_info!("replay_stage-my_leader_slot", ("slot", poh_slot, i64),);
-            println!(
-                "{} new fork:{} parent:{} (leader) root:{}",
-                my_pubkey, poh_slot, parent_slot, root_slot
+            info!(
+                "new fork:{} parent:{} (leader) root:{}",
+                poh_slot, parent_slot, root_slot
             );
 
             let root_distance = poh_slot - root_slot;
@@ -2486,7 +2484,6 @@ impl ReplayStage {
     }
 
     fn generate_new_bank_forks(
-        my_pubkey: &Pubkey,
         blockstore: &Blockstore,
         bank_forks: &RwLock<BankForks>,
         leader_schedule_cache: &Arc<LeaderScheduleCache>,
@@ -2535,8 +2532,7 @@ impl ReplayStage {
                     .slot_leader_at(child_slot, Some(&parent_bank))
                     .unwrap();
                 info!(
-                    "{} new fork:{} parent:{} root:{}",
-                    my_pubkey,
+                    "new fork:{} parent:{} root:{}",
                     child_slot,
                     parent_slot,
                     forks.root()
@@ -2855,7 +2851,6 @@ mod tests {
             .is_none());
         let mut replay_timing = ReplayTiming::default();
         ReplayStage::generate_new_bank_forks(
-            &Pubkey::default(),
             &blockstore,
             &bank_forks,
             &leader_schedule_cache,
@@ -2879,7 +2874,6 @@ mod tests {
             .get(2 * NUM_CONSECUTIVE_LEADER_SLOTS)
             .is_none());
         ReplayStage::generate_new_bank_forks(
-            &Pubkey::default(),
             &blockstore,
             &bank_forks,
             &leader_schedule_cache,