From 4901507891a0dde1dd40e5173a02b4ef81bd82f5 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@gmail.com>
Date: Mon, 11 Nov 2024 13:00:10 +0100
Subject: [PATCH] respect the --format flag everywhere

---
 Cargo.lock              |  4 +--
 src/commands/pins.rs    | 13 +++++++--
 src/commands/sudo.rs    | 47 ++++++++++++++++++++---------
 src/commands/tasks.rs   | 11 +++++--
 src/commands/workers.rs | 17 ++++++++---
 src/main.rs             | 65 +++++++++++++++++++++++++++++++++++------
 6 files changed, 124 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97d1c41..11e9494 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -901,7 +901,7 @@ dependencies = [
 [[package]]
 name = "gevulot-rs"
 version = "0.1.0"
-source = "git+https://github.com/gevulotnetwork/gevulot-rs.git?rev=6695dcb0e7214a3ec07cdc2d83bbc4ff26ae2d38#6695dcb0e7214a3ec07cdc2d83bbc4ff26ae2d38"
+source = "git+https://github.com/gevulotnetwork/gevulot-rs.git?rev=28b6c9f39ebe8144cbd8eac746d7ada5b8646268#28b6c9f39ebe8144cbd8eac746d7ada5b8646268"
 dependencies = [
  "backon",
  "bip32",
@@ -958,7 +958,7 @@ dependencies = [
 
 [[package]]
 name = "gvltctl"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "anyhow",
  "bip32",
diff --git a/src/commands/pins.rs b/src/commands/pins.rs
index 4f17fff..bc82975 100644
--- a/src/commands/pins.rs
+++ b/src/commands/pins.rs
@@ -84,7 +84,11 @@ pub async fn create_pin(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::er
         )
         .await?;
 
-    println!("Created pin with CID: {}", &pin.spec.cid);
+    // Replace println with print_object for consistent formatting
+    print_object(_sub_m, &serde_json::json!({
+        "status": "success",
+        "message": format!("Created pin with CID: {}", &pin.spec.cid)
+    }))?;
     Ok(())
 }
 
@@ -97,7 +101,6 @@ pub async fn create_pin(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::er
 /// * `_sub_m` - A reference to the ArgMatches struct containing parsed command-line arguments.
 ///              This is used to access the CID of the pin to delete and any additional options.
 pub async fn delete_pin(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Deleting a pin");
     let pin_cid = _sub_m
         .get_one::<String>("cid")
         .ok_or("Pin CID is required")?;
@@ -123,6 +126,10 @@ pub async fn delete_pin(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::er
         )
         .await?;
 
-    println!("Deleted pin with CID: {}", pin_cid);
+    // Use print_object for consistent formatting
+    print_object(_sub_m, &serde_json::json!({
+        "status": "success",
+        "message": format!("Deleted pin with CID: {}", pin_cid)
+    }))?;
     Ok(())
 }
diff --git a/src/commands/sudo.rs b/src/commands/sudo.rs
index 7782b4c..a6c5e23 100644
--- a/src/commands/sudo.rs
+++ b/src/commands/sudo.rs
@@ -1,12 +1,9 @@
+use clap::{Arg, Command, ValueHint};
 use gevulot_rs::proto::gevulot::gevulot::{
     MsgSudoDeletePin, MsgSudoDeleteTask, MsgSudoDeleteWorker, MsgSudoFreezeAccount,
 };
 
-use crate::connect_to_gevulot;
-
-const OK: &str = "ok";
-
-use clap::{Arg, Command, ValueHint};
+use crate::{connect_to_gevulot, print_object};
 
 pub fn get_command(chain_args: &[Arg]) -> clap::Command {
     Command::new("sudo")
@@ -83,9 +80,15 @@ pub async fn sudo_delete_pin(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn st
             cid: pin_id.clone(),
         };
         client.sudo.delete_pin(msg).await?;
-        println!("{}", OK);
+        print_object(_sub_m, &serde_json::json!({
+            "status": "success",
+            "message": "Pin deleted successfully"
+        }))?;
     } else {
-        println!("Pin ID is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Pin ID is required"
+        }))?;
     }
     Ok(())
 }
@@ -107,9 +110,15 @@ pub async fn sudo_delete_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn
             id: worker_id.clone(),
         };
         client.sudo.delete_worker(msg).await?;
-        println!("{}", OK);
+        print_object(_sub_m, &serde_json::json!({
+            "status": "success",
+            "message": "Worker deleted successfully"
+        }))?;
     } else {
-        println!("Worker ID is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Worker ID is required"
+        }))?;
     }
     Ok(())
 }
@@ -131,9 +140,15 @@ pub async fn sudo_delete_task(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn s
             id: task_id.clone(),
         };
         client.sudo.delete_task(msg).await?;
-        println!("{}", OK);
+        print_object(_sub_m, &serde_json::json!({
+            "status": "success",
+            "message": "Task deleted successfully"
+        }))?;
     } else {
-        println!("Task ID is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Task ID is required"
+        }))?;
     }
     Ok(())
 }
@@ -155,9 +170,15 @@ pub async fn sudo_freeze_account(_sub_m: &clap::ArgMatches) -> Result<(), Box<dy
             account: account.clone(),
         };
         client.sudo.freeze_account(msg).await?;
-        println!("{}", OK);
+        print_object(_sub_m, &serde_json::json!({
+            "status": "success",
+            "message": "Account frozen successfully"
+        }))?;
     } else {
-        println!("Account address is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Account address is required"
+        }))?;
     }
     Ok(())
 }
diff --git a/src/commands/tasks.rs b/src/commands/tasks.rs
index 712313f..4dd4d5e 100644
--- a/src/commands/tasks.rs
+++ b/src/commands/tasks.rs
@@ -39,7 +39,10 @@ pub async fn get_task(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::erro
         let task: gevulot_rs::models::Task = task.into();
         print_object(_sub_m, &task)?;
     } else {
-        println!("Task ID is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Task ID is required"
+        }))?;
     }
     Ok(())
 }
@@ -109,6 +112,10 @@ pub async fn create_task(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::e
         )
         .await?;
 
-    println!("Created task with ID: {}", resp.id);
+    print_object(_sub_m, &serde_json::json!({
+        "status": "success",
+        "message": "Task created successfully",
+        "task_id": resp.id
+    }))?;
     Ok(())
 }
diff --git a/src/commands/workers.rs b/src/commands/workers.rs
index 713edb8..7aefaa2 100644
--- a/src/commands/workers.rs
+++ b/src/commands/workers.rs
@@ -37,7 +37,10 @@ pub async fn get_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::er
         let worker: gevulot_rs::models::Worker = worker.into();
         print_object(_sub_m, &worker)?;
     } else {
-        println!("Worker ID is required");
+        print_object(_sub_m, &serde_json::json!({
+            "status": "error",
+            "message": "Worker ID is required"
+        }))?;
     }
     Ok(())
 }
@@ -79,7 +82,11 @@ pub async fn create_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std:
         )
         .await?;
 
-    println!("{}", resp.id);
+    print_object(_sub_m, &serde_json::json!({
+        "status": "success",
+        "message": "Worker created successfully",
+        "worker_id": resp.id
+    }))?;
     Ok(())
 }
 
@@ -94,7 +101,6 @@ pub async fn create_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std:
 ///
 /// A Result containing () if successful, or a Box<dyn std::error::Error> if an error occurs.
 pub async fn delete_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Deleting a worker");
     let worker_id = _sub_m
         .get_one::<String>("id")
         .ok_or("Worker ID is required")?;
@@ -117,6 +123,9 @@ pub async fn delete_worker(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std:
         )
         .await?;
 
-    println!("deleted {}", worker_id);
+    print_object(_sub_m, &serde_json::json!({
+        "status": "success",
+        "message": format!("Worker {} deleted successfully", worker_id)
+    }))?;
     Ok(())
 }
diff --git a/src/main.rs b/src/main.rs
index 809a9e4..d31f8ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -578,6 +578,15 @@ async fn send_tokens(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::error
         .await
         .token_transfer(receiver, amount.parse()?)
         .await?;
+
+    let output = serde_json::json!({
+        "success": true,
+        "amount": amount,
+        "receiver": receiver
+    });
+
+    print_object(_sub_m, &output)?;
+
     Ok(())
 }
 
@@ -605,9 +614,14 @@ async fn account_info(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::erro
         .await
         .get_account_balance(address)
         .await?;
-    println!("Account number: {}", account.account_number);
-    println!("Account sequence: {}", account.sequence);
-    println!("Balance: {:#?}", balance.amount);
+
+    let output = serde_json::json!({
+        "account_number": account.account_number,
+        "sequence": account.sequence,
+        "balance": balance.amount.to_string()
+    });
+
+    print_object(_sub_m, &output)?;
     Ok(())
 }
 
@@ -641,13 +655,40 @@ async fn generate_key(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::erro
     // Get the ECDSA/secp256k1 signing and verification keys for the xprv and xpub
     let sk = SigningKey::from_slice(&child_xprv.private_key().to_bytes())?;
 
-    println!("{}", sk.public_key().account_id("gvlt").unwrap());
+    let account_id = sk.public_key().account_id("gvlt").unwrap();
+    let phrase = mnemonic.phrase();
+
+    let output = serde_json::json!({
+        "account_id": account_id,
+        "mnemonic": phrase
+    });
 
     if let Some(file) = _sub_m.get_one::<String>("file") {
         let mut file = File::create(file)?;
-        file.write_all(mnemonic.phrase().as_bytes())?;
-    } else {
-        println!("{}", mnemonic.phrase());
+        file.write_all(phrase.as_bytes())?;
+    }
+
+    match _sub_m.get_one::<String>("format").map(String::as_str) {
+        Some("json") => {
+            let json = serde_json::to_string(&output)?;
+            println!("{}", json);
+        }
+        Some("prettyjson") => {
+            let prettyjson = serde_json::to_string_pretty(&output)?;
+            println!("{}", prettyjson);
+        }
+        Some("toml") => {
+            let toml = toml::to_string(&output)?;
+            println!("{}", toml);
+        }
+        Some("yaml") => {
+            let yaml = serde_yaml::to_string(&output)?;
+            println!("{}", yaml);
+        }
+        _ => {
+            println!("{}", account_id);
+            println!("{}", phrase);
+        }
     }
 
     Ok(())
@@ -686,8 +727,10 @@ async fn compute_key(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::error
     // Get the ECDSA/secp256k1 signing and verification keys for the xprv and xpub
     let sk = SigningKey::from_slice(&child_xprv.private_key().to_bytes())?;
 
-    println!("{}", sk.public_key().account_id("gvlt").unwrap());
+    let account_id = sk.public_key().account_id("gvlt").unwrap();
 
+    let output = serde_json::json!({ "account_id": account_id });
+    print_object(_sub_m, &output)?;
     Ok(())
 }
 
@@ -719,7 +762,11 @@ async fn generate_completion(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn st
     Ok(())
 }
 async fn list_workflows(_sub_m: &clap::ArgMatches) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Listing all workflows");
+    let output = serde_json::json!({
+        "message": "Listing all workflows",
+        "status": "not_implemented"
+    });
+    print_object(_sub_m, &output)?;
     todo!();
 }