From 9547b00f4c20d61e88171042b13b366692c0f81a Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 9 Jul 2022 12:28:44 -0700
Subject: [PATCH] epoch-info: Add epochCompletedPercent field to json output

---
 cli-output/src/cli_output.rs | 6 ++----
 cli/src/cluster_query.rs     | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
index 0fb4899d3..d02b43dc7 100644
--- a/cli-output/src/cli_output.rs
+++ b/cli-output/src/cli_output.rs
@@ -251,6 +251,7 @@ pub struct CliSlotStatus {
 pub struct CliEpochInfo {
     #[serde(flatten)]
     pub epoch_info: EpochInfo,
+    pub epoch_completed_percent: f64,
     #[serde(skip)]
     pub average_slot_time_ms: u64,
     #[serde(skip)]
@@ -285,10 +286,7 @@ impl fmt::Display for CliEpochInfo {
         writeln_name_value(
             f,
             "Epoch Completed Percent:",
-            &format!(
-                "{:>3.3}%",
-                self.epoch_info.slot_index as f64 / self.epoch_info.slots_in_epoch as f64 * 100_f64
-            ),
+            &format!("{:>3.3}%", self.epoch_completed_percent),
         )?;
         let remaining_slots_in_epoch = self.epoch_info.slots_in_epoch - self.epoch_info.slot_index;
         writeln_name_value(
diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
index b64c5fd82..5bf175bbe 100644
--- a/cli/src/cluster_query.rs
+++ b/cli/src/cluster_query.rs
@@ -1101,8 +1101,11 @@ pub fn process_get_epoch(rpc_client: &RpcClient, _config: &CliConfig) -> Process
 
 pub fn process_get_epoch_info(rpc_client: &RpcClient, config: &CliConfig) -> ProcessResult {
     let epoch_info = rpc_client.get_epoch_info()?;
+    let epoch_completed_percent =
+        epoch_info.slot_index as f64 / epoch_info.slots_in_epoch as f64 * 100_f64;
     let mut cli_epoch_info = CliEpochInfo {
         epoch_info,
+        epoch_completed_percent,
         average_slot_time_ms: 0,
         start_block_time: None,
         current_block_time: None,