Allow disabling printing in wait_for_tx

commit-id:94945a36

Author: cptartur

crates/sncast/src/lib.rs

@@ -132,6 +132,7 @@ pub struct AccountData {
 pub struct WaitForTx {
     pub wait: bool,
     pub wait_params: ValidatedWaitParams,
+    pub silent: bool,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, Copy, PartialEq)]
@@ -576,9 +577,9 @@ pub async fn wait_for_tx(
     provider: &JsonRpcClient<HttpTransport>,
     tx_hash: Felt,
     wait_params: ValidatedWaitParams,
-    ui: &UI,
+    ui: Option<&UI>,
 ) -> Result<String, WaitForTransactionError> {
-    ui.println(&format!("Transaction hash: {tx_hash:#x}"));
+    ui.inspect(|ui| ui.println(&format!("Transaction hash: {tx_hash:#x}")));
 
     let retries = wait_params.get_retries();
     for i in (1..retries).rev() {
@@ -610,24 +611,32 @@ pub async fn wait_for_tx(
             Ok(starknet::core::types::TransactionStatus::PreConfirmed(
                 ExecutionResult::Succeeded,
             )) => {
-                let remaining_time = wait_params.remaining_time(i);
-                ui.println(&"Transaction status: PRE_CONFIRMED".to_string());
-                ui.println(&format!(
-                    "Waiting for transaction to be accepted ({i} retries / {remaining_time}s left until timeout)"
-                ));
+                ui.inspect(|ui| {
+                    let remaining_time = wait_params.remaining_time(i);
+                    ui.println(&"Transaction status: PRE_CONFIRMED".to_string());
+                    ui.println(&format!(
+                        "Waiting for transaction to be accepted ({i} retries / {remaining_time}s left until timeout)"
+                    ));
+                });
             }
             Ok(
                 starknet::core::types::TransactionStatus::Received
                 | starknet::core::types::TransactionStatus::Candidate,
             )
             | Err(StarknetError(TransactionHashNotFound)) => {
-                let remaining_time = wait_params.remaining_time(i);
-                ui.println(&format!(
-                    "Waiting for transaction to be accepted ({i} retries / {remaining_time}s left until timeout)"
-                ));
+                ui.inspect(|ui| {
+                        let remaining_time = wait_params.remaining_time(i);
+                        ui.println(&format!(
+                            "Waiting for transaction to be accepted ({i} retries / {remaining_time}s left until timeout)"
+                        ));
+                    });
             }
             Err(ProviderError::RateLimited) => {
-                ui.println(&"Request rate limited while waiting for transaction to be accepted");
+                ui.inspect(|ui| {
+                    ui.println(
+                        &"Request rate limited while waiting for transaction to be accepted",
+                    );
+                });
                 sleep(Duration::from_secs(wait_params.get_retry_interval().into()));
             }
             Err(err) => return Err(WaitForTransactionError::ProviderError(err.into())),
@@ -664,7 +673,14 @@ pub async fn handle_wait_for_tx<T>(
     ui: &UI,
 ) -> Result<T, WaitForTransactionError> {
     if wait_config.wait {
-        return match wait_for_tx(provider, transaction_hash, wait_config.wait_params, ui).await {
+        return match wait_for_tx(
+            provider,
+            transaction_hash,
+            wait_config.wait_params,
+            if wait_config.silent { None } else { Some(ui) },
+        )
+        .await
+        {
             Ok(_) => Ok(return_value),
             Err(error) => Err(error),
         };

crates/sncast/src/main.rs

@@ -259,6 +259,7 @@ async fn run_async_command(cli: Cli, config: CastConfig, ui: &UI) -> Result<()>
     let wait_config = WaitForTx {
         wait: cli.wait,
         wait_params: config.wait_params,
+        silent: false,
     };
 
     match cli.command {

crates/sncast/src/starknet_commands/script/run.rs

@@ -143,6 +143,7 @@ impl<'a> ExtensionLogic for CastScriptExtension<'a> {
                     WaitForTx {
                         wait: true,
                         wait_params: self.config.wait_params,
+                        silent: false,
                     },
                     true,
                     self.ui,
@@ -183,6 +184,7 @@ impl<'a> ExtensionLogic for CastScriptExtension<'a> {
                     WaitForTx {
                         wait: true,
                         wait_params: self.config.wait_params,
+                        silent: false,
                     },
                     self.ui,
                 ));
@@ -221,6 +223,7 @@ impl<'a> ExtensionLogic for CastScriptExtension<'a> {
                     WaitForTx {
                         wait: true,
                         wait_params: self.config.wait_params,
+                        silent: false,
                     },
                     self.ui,
                 ));

crates/sncast/tests/integration/wait_for_tx.rs

@@ -24,7 +24,7 @@ async fn test_happy_path() {
         &provider,
         MAP_CONTRACT_DECLARE_TX_HASH_SEPOLIA.parse().unwrap(),
         ValidatedWaitParams::default(),
-        &ui,
+        Some(&ui),
     )
     .await;
 
@@ -103,7 +103,7 @@ async fn test_wait_for_reverted_transaction() {
         &provider,
         transaction_hash,
         ValidatedWaitParams::new(1, 3),
-        &ui,
+        Some(&ui),
     )
     .await
     .map_err(anyhow::Error::from)
@@ -119,7 +119,7 @@ async fn test_wait_for_nonexistent_tx() {
         &provider,
         "0x123456789".parse().expect("Could not parse a number"),
         ValidatedWaitParams::new(1, 3),
-        &ui,
+        Some(&ui),
     )
     .await
     .map_err(anyhow::Error::from)
@@ -137,6 +137,7 @@ async fn test_happy_path_handle_wait_for_tx() {
         WaitForTx {
             wait: true,
             wait_params: ValidatedWaitParams::new(5, 63),
+            silent: false,
         },
         &ui,
     )
@@ -154,7 +155,7 @@ async fn test_wait_for_wrong_retry_values() {
         &provider,
         MAP_CONTRACT_DECLARE_TX_HASH_SEPOLIA.parse().unwrap(),
         ValidatedWaitParams::new(2, 1),
-        &ui,
+        Some(&ui),
     )
     .await
     .unwrap();
@@ -169,7 +170,7 @@ async fn test_wait_for_wrong_retry_values_timeout_zero() {
         &provider,
         MAP_CONTRACT_DECLARE_TX_HASH_SEPOLIA.parse().unwrap(),
         ValidatedWaitParams::new(2, 0),
-        &ui,
+        Some(&ui),
     )
     .await
     .unwrap();
@@ -184,7 +185,7 @@ async fn test_wait_for_wrong_retry_values_interval_zero() {
         &provider,
         MAP_CONTRACT_DECLARE_TX_HASH_SEPOLIA.parse().unwrap(),
         ValidatedWaitParams::new(0, 1),
-        &ui,
+        Some(&ui),
     )
     .await
     .unwrap();