From df0d8011d9f55f087478b0795ed0c1657b3552af Mon Sep 17 00:00:00 2001
From: Hansie Odendaal <39146854+hansieodendaal@users.noreply.github.com>
Date: Thu, 16 May 2024 15:53:37 +0200
Subject: [PATCH] feat: fix base node console display (#6341)

Description
---
Fixed base node console display to show `hdrs/s` when syncing headers
instead of `blks/s`

Motivation and Context
---
See above

How Has This Been Tested?
---
System-level testing

What process can a PR reviewer use to test or verify this change?
---
Code review

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify

<!-- Does this include a breaking change? If so, include this line as a
footer -->
<!-- BREAKING CHANGE: Description what the user should do, e.g. delete a
database, resync the chain -->
---
 .../states/events_and_states.rs                | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/base_layer/core/src/base_node/state_machine_service/states/events_and_states.rs b/base_layer/core/src/base_node/state_machine_service/states/events_and_states.rs
index e44673939a..19c88d1278 100644
--- a/base_layer/core/src/base_node/state_machine_service/states/events_and_states.rs
+++ b/base_layer/core/src/base_node/state_machine_service/states/events_and_states.rs
@@ -206,10 +206,10 @@ impl StateInfo {
                     .unwrap_or_else(|| "".to_string())
             ),
             HeaderSync(None) => "Starting header sync".to_string(),
-            HeaderSync(Some(info)) => format!("Syncing headers: {}", info.sync_progress_string()),
+            HeaderSync(Some(info)) => format!("Syncing headers: {}", info.sync_progress_string_headers()),
             HorizonSync(info) => info.to_progress_string(),
 
-            BlockSync(info) => format!("Syncing blocks: {}", info.sync_progress_string()),
+            BlockSync(info) => format!("Syncing blocks: {}", info.sync_progress_string_blocks()),
             Listening(_) => "Listening".to_string(),
             SyncFailed(details) => format!("Sync failed: {}", details),
         }
@@ -299,7 +299,15 @@ impl BlockSyncInfo {
         }
     }
 
-    pub fn sync_progress_string(&self) -> String {
+    pub fn sync_progress_string_headers(&self) -> String {
+        self.sync_progress("hdrs")
+    }
+
+    pub fn sync_progress_string_blocks(&self) -> String {
+        self.sync_progress("blks")
+    }
+
+    fn sync_progress(&self, item: &str) -> String {
         format!(
             "({}) {}/{} ({:.0}%){}{}",
             self.sync_peer.node_id().short_str(),
@@ -308,7 +316,7 @@ impl BlockSyncInfo {
             (self.local_height as f64 / self.tip_height as f64 * 100.0).floor(),
             self.sync_peer
                 .items_per_second()
-                .map(|bps| format!(" {:.2?} blks/s", bps))
+                .map(|bps| format!(" {:.2?} {}/s", bps, item))
                 .unwrap_or_default(),
             self.sync_peer
                 .calc_avg_latency()
@@ -320,6 +328,6 @@ impl BlockSyncInfo {
 
 impl Display for BlockSyncInfo {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
-        writeln!(f, "Syncing {}", self.sync_progress_string())
+        writeln!(f, "Syncing {}", self.sync_progress_string_blocks())
     }
 }