fix: masp tx check result

heliaxdev · Sep 4, 2024 · 4d01071 · 4d01071
1 parent fcc1230
commit 4d01071
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/tasks/tx_shielded_transfer.rs b/src/tasks/tx_shielded_transfer.rs
@@ -105,8 +105,15 @@ impl Task for TxShieldedTransfer {
         self.fetch_info(sdk, &mut storage).await;
 
         if Self::is_tx_rejected(&transfer_tx, &tx) {
-            let errors = Self::get_tx_errors(&transfer_tx, &tx.unwrap()).unwrap_or_default();
-            return Ok(StepResult::fail(errors));
+            match tx {
+                Ok(tx) => {
+                    let errors = Self::get_tx_errors(&transfer_tx, &tx).unwrap_or_default();
+                    return Ok(StepResult::fail(errors));
+                }
+                Err(e) => {
+                    return Ok(StepResult::fail(e.to_string()));
+                }
+            }
         }
 
         let Ok(ProcessTxResponse::Applied(TxResponse { height, .. })) = &tx else {

diff --git a/src/tasks/tx_shielding_transfer.rs b/src/tasks/tx_shielding_transfer.rs
@@ -105,8 +105,15 @@ impl Task for TxShieldingTransfer {
         self.fetch_info(sdk, &mut storage).await;
 
         if Self::is_tx_rejected(&transfer_tx, &tx) {
-            let errors = Self::get_tx_errors(&transfer_tx, &tx.unwrap()).unwrap_or_default();
-            return Ok(StepResult::fail(errors));
+            match tx {
+                Ok(tx) => {
+                    let errors = Self::get_tx_errors(&transfer_tx, &tx).unwrap_or_default();
+                    return Ok(StepResult::fail(errors));
+                }
+                Err(e) => {
+                    return Ok(StepResult::fail(e.to_string()));
+                }
+            }
         }
 
         let Ok(ProcessTxResponse::Applied(TxResponse { height, .. })) = &tx else {

diff --git a/src/tasks/tx_unshielding_transfer.rs b/src/tasks/tx_unshielding_transfer.rs
@@ -135,8 +135,15 @@ impl Task for TxUnshieldingTransfer {
         self.fetch_info(sdk, &mut storage).await;
 
         if Self::is_tx_rejected(&transfer_tx, &tx) {
-            let errors = Self::get_tx_errors(&transfer_tx, &tx.unwrap()).unwrap_or_default();
-            return Ok(StepResult::fail(errors));
+            match tx {
+                Ok(tx) => {
+                    let errors = Self::get_tx_errors(&transfer_tx, &tx).unwrap_or_default();
+                    return Ok(StepResult::fail(errors));
+                }
+                Err(e) => {
+                    return Ok(StepResult::fail(e.to_string()));
+                }
+            }
         }
 
         let Ok(ProcessTxResponse::Applied(TxResponse { height, .. })) = &tx else {