From fd13979627791591b750a407f5c9f282b5bb0c65 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 30 Jan 2024 09:28:50 -0700 Subject: [PATCH 1/2] refactor(cli): replace println with tracing info --- crates/cli/src/commands/order/add.rs | 3 ++- crates/cli/src/commands/order/list.rs | 5 ++--- crates/cli/src/commands/order/remove.rs | 3 ++- crates/cli/src/commands/vault/deposit.rs | 5 +++-- crates/cli/src/commands/vault/list.rs | 5 ++--- crates/cli/src/commands/vault/withdraw.rs | 3 ++- crates/cli/src/status.rs | 9 +++++---- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/crates/cli/src/commands/order/add.rs b/crates/cli/src/commands/order/add.rs index 33294da4f..ff921d38c 100644 --- a/crates/cli/src/commands/order/add.rs +++ b/crates/cli/src/commands/order/add.rs @@ -7,6 +7,7 @@ use rain_orderbook_common::add_order::AddOrderArgs; use rain_orderbook_common::transaction::TransactionArgs; use std::fs::read_to_string; use std::path::PathBuf; +use tracing::info; #[derive(Args, Clone)] pub struct CliOrderAddArgs { @@ -36,7 +37,7 @@ impl Execute for CliOrderAddArgs { let mut tx_args: TransactionArgs = self.transaction_args.clone().into(); tx_args.try_fill_chain_id().await?; - println!("----- Add Order -----"); + info!("----- Add Order -----"); add_order_args .execute(tx_args, |status| { display_write_transaction_status(status); diff --git a/crates/cli/src/commands/order/list.rs b/crates/cli/src/commands/order/list.rs index 43180c8e8..4545751df 100644 --- a/crates/cli/src/commands/order/list.rs +++ b/crates/cli/src/commands/order/list.rs @@ -5,8 +5,8 @@ use clap::Args; use comfy_table::Table; use rain_orderbook_common::subgraph::SubgraphArgs; use rain_orderbook_subgraph_client::types::orders_list::Order; +use tracing::info; -use tracing::debug; #[derive(Args, Clone)] pub struct CliOrderListArgs { #[clap(flatten)] @@ -21,10 +21,9 @@ impl Execute for CliOrderListArgs { .await? .orders_list() .await?; - debug!("{:#?}", orders); let table = build_orders_table(orders)?; - println!("{}", table); + info!("{}", table); Ok(()) } diff --git a/crates/cli/src/commands/order/remove.rs b/crates/cli/src/commands/order/remove.rs index 25d72033f..f034b4a1a 100644 --- a/crates/cli/src/commands/order/remove.rs +++ b/crates/cli/src/commands/order/remove.rs @@ -7,6 +7,7 @@ use clap::Args; use rain_orderbook_common::remove_order::RemoveOrderArgs; use rain_orderbook_common::subgraph::SubgraphArgs; use rain_orderbook_common::transaction::TransactionArgs; +use tracing::info; #[derive(Args, Clone)] pub struct CliOrderRemoveArgs { @@ -33,7 +34,7 @@ impl Execute for CliOrderRemoveArgs { let mut tx_args: TransactionArgs = self.transaction_args.clone().into(); tx_args.try_fill_chain_id().await?; - println!("----- Remove Order -----"); + info!("----- Remove Order -----"); remove_order_args .execute(tx_args, |status| { display_write_transaction_status(status); diff --git a/crates/cli/src/commands/vault/deposit.rs b/crates/cli/src/commands/vault/deposit.rs index b22486eb5..9f972f28e 100644 --- a/crates/cli/src/commands/vault/deposit.rs +++ b/crates/cli/src/commands/vault/deposit.rs @@ -5,6 +5,7 @@ use alloy_primitives::{Address, U256}; use anyhow::Result; use clap::Args; use rain_orderbook_common::{deposit::DepositArgs, transaction::TransactionArgs}; +use tracing::info; #[derive(Args, Clone)] pub struct CliVaultDepositArgs { @@ -37,14 +38,14 @@ impl Execute for CliVaultDepositArgs { tx_args.try_fill_chain_id().await?; let deposit_args: DepositArgs = self.clone().into(); - println!("----- Transaction (1/2): Approve ERC20 token spend -----"); + info!("----- Transaction (1/2): Approve ERC20 token spend -----"); deposit_args .execute_approve(tx_args.clone(), |status| { display_write_transaction_status(status); }) .await?; - println!("----- Transaction (2/2): Deposit tokens into Orderbook -----"); + info!("----- Transaction (2/2): Deposit tokens into Orderbook -----"); deposit_args .execute_deposit(tx_args, |status| { display_write_transaction_status(status); diff --git a/crates/cli/src/commands/vault/list.rs b/crates/cli/src/commands/vault/list.rs index 60f6f9250..d8aaab87d 100644 --- a/crates/cli/src/commands/vault/list.rs +++ b/crates/cli/src/commands/vault/list.rs @@ -4,8 +4,8 @@ use clap::Args; use comfy_table::Table; use rain_orderbook_common::subgraph::SubgraphArgs; use rain_orderbook_subgraph_client::types::vaults_list::TokenVault; +use tracing::info; -use tracing::debug; #[derive(Args, Clone)] pub struct CliVaultListArgs { #[clap(flatten)] @@ -20,10 +20,9 @@ impl Execute for CliVaultListArgs { .await? .vaults_list() .await?; - debug!("{:#?}", vaults); let table = build_table(vaults)?; - println!("{}", table); + info!("{}", table); Ok(()) } diff --git a/crates/cli/src/commands/vault/withdraw.rs b/crates/cli/src/commands/vault/withdraw.rs index f0c2884ee..be23e44ae 100644 --- a/crates/cli/src/commands/vault/withdraw.rs +++ b/crates/cli/src/commands/vault/withdraw.rs @@ -5,6 +5,7 @@ use anyhow::Result; use clap::Args; use rain_orderbook_common::transaction::TransactionArgs; use rain_orderbook_common::withdraw::WithdrawArgs; +use tracing::info; #[derive(Args, Clone)] pub struct CliVaultWithdrawArgs { @@ -37,7 +38,7 @@ impl Execute for CliVaultWithdrawArgs { tx_args.try_fill_chain_id().await?; let withdraw_args: WithdrawArgs = self.clone().into(); - println!("----- Withdraw tokens from Vault -----"); + info!("----- Withdraw tokens from Vault -----"); withdraw_args .execute(tx_args, |status| { display_write_transaction_status(status); diff --git a/crates/cli/src/status.rs b/crates/cli/src/status.rs index 3177df3db..cde8dce3b 100644 --- a/crates/cli/src/status.rs +++ b/crates/cli/src/status.rs @@ -1,20 +1,21 @@ use alloy_ethers_typecast::transaction::WriteTransactionStatus; use alloy_sol_types::SolCall; use std::fmt::Debug; +use tracing::info; pub fn display_write_transaction_status(status: WriteTransactionStatus) { match status { WriteTransactionStatus::PendingPrepare(_) => { - println!("⏳ Preparing transaction. Please wait."); + info!("⏳ Preparing transaction. Please wait."); } WriteTransactionStatus::PendingSign(_) => { - println!("🖋 Please sign the transaction on your Ledger device."); + info!("🖋 Please sign the transaction on your Ledger device."); } WriteTransactionStatus::PendingSend(_) => { - println!("⏳ Awaiting transaction confirmation. Please wait."); + info!("⏳ Awaiting transaction confirmation. Please wait."); } WriteTransactionStatus::Confirmed(receipt) => { - println!("✅ Transaction confirmed: {:?}", receipt.transaction_hash); + info!("✅ Transaction confirmed: {:?}", receipt.transaction_hash); } } } From 31be235c73f9e6333e641ead5b0ef3ac3ada7659 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 30 Jan 2024 13:42:42 -0700 Subject: [PATCH 2/2] fix(cli): newline on table log --- crates/cli/src/commands/order/list.rs | 2 +- crates/cli/src/commands/vault/list.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/commands/order/list.rs b/crates/cli/src/commands/order/list.rs index 4545751df..599459cd1 100644 --- a/crates/cli/src/commands/order/list.rs +++ b/crates/cli/src/commands/order/list.rs @@ -23,7 +23,7 @@ impl Execute for CliOrderListArgs { .await?; let table = build_orders_table(orders)?; - info!("{}", table); + info!("\n{}", table); Ok(()) } diff --git a/crates/cli/src/commands/vault/list.rs b/crates/cli/src/commands/vault/list.rs index d8aaab87d..12f7c5572 100644 --- a/crates/cli/src/commands/vault/list.rs +++ b/crates/cli/src/commands/vault/list.rs @@ -22,7 +22,7 @@ impl Execute for CliVaultListArgs { .await?; let table = build_table(vaults)?; - info!("{}", table); + info!("\n{}", table); Ok(()) }