log execution to return errors

marinade-finance · Jun 28, 2023 · 6da847e · 6da847e
1 parent 6de2969
commit 6da847e
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/libs/marinade-client-rs/src/transaction_executors.rs b/libs/marinade-client-rs/src/transaction_executors.rs
@@ -1,5 +1,5 @@
 use anchor_client::RequestBuilder;
-use anyhow::anyhow;
+use anyhow::{anyhow, bail};
 use log::{debug, error, info, warn};
 use solana_client::client_error::ClientErrorKind;
 use solana_client::rpc_client::RpcClient;
@@ -25,7 +25,7 @@ impl<'a, C: Deref<Target = impl Signer> + Clone> TransactionExecutor for Request
     }
 }
 
-pub fn log_execution(execution_result: Result<Signature, anchor_client::ClientError>) {
+pub fn log_execution(execution_result: Result<Signature, anchor_client::ClientError>) -> anyhow::Result<()>{
     match execution_result {
         Ok(signature) => debug!("Transaction {}", signature),
         Err(err) => {
@@ -56,9 +56,11 @@ pub fn log_execution(execution_result: Result<Signature, anchor_client::ClientEr
                 _ => {
                     error!("Transaction ERR {:?}", err);
                 }
+                bail!("Transaction error: {}", err);
             }
         }
     }
+    Ok(())
 }
 
 pub trait TransactionSimulator {
@@ -74,7 +76,7 @@ impl<'a, C: Deref<Target = impl Signer> + Clone> TransactionSimulator for Reques
     }
 }
 
-pub fn log_simulation(simulation_result: RpcResult<RpcSimulateTransactionResult>) {
+pub fn log_simulation(simulation_result: RpcResult<RpcSimulateTransactionResult>) -> anyhow::Result<()> {
     match simulation_result {
         Ok(result) => {
             if let Some(logs) = &result.value.logs {
@@ -84,6 +86,7 @@ pub fn log_simulation(simulation_result: RpcResult<RpcSimulateTransactionResult>
             }
             if result.value.err.is_some() {
                 error!("Transaction ERR {:?}", result);
+                bail!("Transaction error: {}", err);
             } else {
                 info!("Transaction simulation Ok");
             }
@@ -109,8 +112,10 @@ pub fn log_simulation(simulation_result: RpcResult<RpcSimulateTransactionResult>
                 }
                 error!("Transaction ERR {:?}", err);
             }
+            bail!("Transaction error: {}", err);
         }
     }
+    Ok(())
 }
 
 pub fn execute<'a, I, C>(
@@ -126,15 +131,15 @@ where
         let commitment_level = rpc_client.commitment().commitment;
         anchor_builders
             .into_iter()
-            .for_each(|builder| log_execution(builder.execute(commitment_level)));
+            .try_for_each(|builder| log_execution(builder.execute(commitment_level)))?;
     } else {
         let mut builders_iterator = anchor_builders.into_iter();
         log_simulation(
             builders_iterator
                 .next()
                 .ok_or(anyhow!("No transactions to simulate"))?
                 .simulate(rpc_client),
-        );
+        )?;
         if builders_iterator.next().is_some() {
             warn!(
                 "Simulation mode: only the first transaction was simulated. The rest are ignored."