From 74d02acafd794f3ab1cddb3c8cb97b51238d40ea Mon Sep 17 00:00:00 2001
From: Tyera <tyera@solana.com>
Date: Fri, 15 Dec 2023 10:38:44 -0700
Subject: [PATCH] ledger-tool: Use OutputFormat printer in program subcommand
 (#34475)

Use OutputFormat printer
---
 ledger-tool/src/program.rs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/ledger-tool/src/program.rs b/ledger-tool/src/program.rs
index be73e199d..f26ed8aa2 100644
--- a/ledger-tool/src/program.rs
+++ b/ledger-tool/src/program.rs
@@ -9,6 +9,7 @@ use {
         syscalls::create_program_runtime_environment_v1,
     },
     solana_clap_utils::input_parsers::pubkeys_of,
+    solana_cli_output::{OutputFormat, QuietDisplay, VerboseDisplay},
     solana_ledger::{
         blockstore_options::{AccessType, BlockstoreRecoveryMode},
         blockstore_processor::ProcessOptions,
@@ -33,7 +34,7 @@ use {
     },
     std::{
         collections::HashSet,
-        fmt::{Debug, Formatter},
+        fmt::{self, Debug, Formatter},
         fs::File,
         io::{Read, Seek, Write},
         path::{Path, PathBuf},
@@ -263,8 +264,9 @@ struct Output {
     log: Vec<String>,
 }
 
-impl Debug for Output {
+impl fmt::Display for Output {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Program output:")?;
         writeln!(f, "Result: {}", self.result)?;
         writeln!(f, "Instruction Count: {}", self.instruction_count)?;
         writeln!(f, "Execution time: {} us", self.execution_time.as_micros())?;
@@ -275,6 +277,9 @@ impl Debug for Output {
     }
 }
 
+impl QuietDisplay for Output {}
+impl VerboseDisplay for Output {}
+
 // Replace with std::lazy::Lazy when stabilized.
 // https://github.com/rust-lang/rust/issues/74465
 struct LazyAnalysis<'a, 'b> {
@@ -612,16 +617,6 @@ pub fn program(ledger_path: &Path, matches: &ArgMatches<'_>) {
             .get_recorded_content()
             .to_vec(),
     };
-    match matches.value_of("output_format") {
-        Some("json") => {
-            println!("{}", serde_json::to_string_pretty(&output).unwrap());
-        }
-        Some("json-compact") => {
-            println!("{}", serde_json::to_string(&output).unwrap());
-        }
-        _ => {
-            println!("Program output:");
-            println!("{output:?}");
-        }
-    }
+    let output_format = OutputFormat::from_matches(matches, "output_format", false);
+    println!("{}", output_format.formatted_string(&output));
 }