Rewrite UTXOs display with comfy_table

Author: KyrylR

crates/cli-client/src/cli/swap.rs

@@ -26,28 +26,28 @@ use simplicityhl::elements::pset::serialize::Serialize;
 use simplicityhl::simplicity::hex::DisplayHex;
 use simplicityhl_core::{LIQUID_TESTNET_BITCOIN_ASSET, LIQUID_TESTNET_GENESIS};
 
-pub(crate) struct LocalSwapData {
+pub struct LocalSwapData {
     pub(crate) swap_args: SwapWithChangeArguments,
     pub(crate) taproot_pubkey_gen: contracts::sdk::taproot_pubkey_gen::TaprootPubkeyGen,
     pub(crate) metadata: ContractMetadata,
     pub(crate) current_outpoint: simplicityhl::elements::OutPoint,
     pub(crate) current_value: u64,
 }
 
-pub(crate) struct LocalCancellableSwap {
+pub struct LocalCancellableSwap {
     pub(crate) swap_args: SwapWithChangeArguments,
     pub(crate) taproot_pubkey_gen: contracts::sdk::taproot_pubkey_gen::TaprootPubkeyGen,
     pub(crate) metadata: ContractMetadata,
 }
 
-pub(crate) struct LocalWithdrawableSwap {
+pub struct LocalWithdrawableSwap {
     pub(crate) swap_args: SwapWithChangeArguments,
     pub(crate) taproot_pubkey_gen: contracts::sdk::taproot_pubkey_gen::TaprootPubkeyGen,
     pub(crate) metadata: ContractMetadata,
     pub(crate) settlement_amount: u64,
 }
 
-pub(crate) struct ActiveSwapDisplay {
+pub struct ActiveSwapDisplay {
     pub(crate) index: usize,
     pub(crate) offering: String,
     pub(crate) price: String,
@@ -56,15 +56,15 @@ pub(crate) struct ActiveSwapDisplay {
     pub(crate) seller: String,
 }
 
-pub(crate) struct CancellableSwapDisplay {
+pub struct CancellableSwapDisplay {
     pub(crate) index: usize,
     pub(crate) collateral: String,
     pub(crate) asset: String,
     pub(crate) expired: String,
     pub(crate) contract: String,
 }
 
-pub(crate) struct WithdrawableSwapDisplay {
+pub struct WithdrawableSwapDisplay {
     pub(crate) index: usize,
     pub(crate) settlement: String,
     pub(crate) asset: String,

crates/cli-client/src/cli/tables.rs

@@ -136,6 +136,24 @@ impl TableData for WithdrawableSwapDisplay {
     }
 }
 
+pub struct UtxoDisplay {
+    pub outpoint: String,
+    pub asset: String,
+    pub value: String,
+}
+
+impl TableData for UtxoDisplay {
+    fn get_header() -> Vec<String> {
+        vec!["Outpoint", "Asset", "Value"]
+            .into_iter()
+            .map(String::from)
+            .collect()
+    }
+    fn to_row(&self) -> Vec<String> {
+        vec![self.outpoint.clone(), self.asset.clone(), self.value.clone()]
+    }
+}
+
 fn render_table<T: TableData>(items: &[T], empty_msg: &str) {
     if items.is_empty() {
         println!("  ({empty_msg})");
@@ -188,3 +206,7 @@ pub fn display_cancellable_swaps_table(cancellable_swaps: &[CancellableSwapDispl
 pub fn display_withdrawable_swaps_table(withdrawable_swaps: &[WithdrawableSwapDisplay]) {
     render_table(withdrawable_swaps, "No withdrawable swaps found");
 }
+
+pub fn display_utxo_table(utxos: &[UtxoDisplay]) {
+    render_table(utxos, "No UTXOs found");
+}

crates/cli-client/src/cli/wallet.rs

@@ -1,3 +1,4 @@
+use crate::cli::tables::{UtxoDisplay, display_utxo_table};
 use crate::cli::{Cli, WalletCommand};
 use crate::config::Config;
 use crate::error::Error;
@@ -63,24 +64,25 @@ impl Cli {
                 let results = wallet.store().query_utxos(&[filter]).await?;
 
                 if let Some(coin_store::UtxoQueryResult::Found(entries, _)) = results.into_iter().next() {
-                    for entry in &entries {
-                        let (Some(asset), Some(value)) = (entry.asset(), entry.value()) else {
-                            println!(
-                                "{:<76} | {:<64} | {:<25}",
-                                entry.outpoint(),
-                                "Confidential",
-                                "Confidential"
-                            );
-
-                            continue;
-                        };
-
-                        println!("{:<76} | {:<64} | {:<25}", entry.outpoint(), asset, value);
-                    }
-
+                    let displays: Vec<UtxoDisplay> = entries
+                        .iter()
+                        .map(|entry| {
+                            let (asset, value) = match (entry.asset(), entry.value()) {
+                                (Some(a), Some(v)) => (a.to_string(), v.to_string()),
+                                _ => ("Confidential".to_string(), "Confidential".to_string()),
+                            };
+                            UtxoDisplay {
+                                outpoint: entry.outpoint().to_string(),
+                                asset,
+                                value,
+                            }
+                        })
+                        .collect();
+
+                    display_utxo_table(&displays);
                     println!("Total: {} UTXOs", entries.len());
                 } else {
-                    println!("No UTXOs found");
+                    display_utxo_table(&[]);
                 }
                 Ok(())
             }