From e49e43b910f56b45fa4642d11263c8c1b1fa264d Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Fri, 1 Mar 2024 13:37:51 -0800 Subject: [PATCH] Remove unnecessary unwrap from `simulate_transaction_unchecked()` (#35375) Remove unnecessary unwrap from simulate_transaction_unchecked() (cherry picked from commit cb260f10d1b05743391b9b442bf175c19d894931) --- runtime/src/bank.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 98a8eda628da74..b15f3f6229a5f6 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -4295,9 +4295,7 @@ impl Bank { let post_simulation_accounts = loaded_transactions .into_iter() .next() - .unwrap() - .0 - .ok() + .and_then(|(loaded_transactions_res, _)| loaded_transactions_res.ok()) .map(|loaded_transaction| { loaded_transaction .accounts @@ -4319,7 +4317,12 @@ impl Bank { debug!("simulate_transaction: {:?}", timings); - let execution_result = execution_results.pop().unwrap(); + let execution_result = + execution_results + .pop() + .unwrap_or(TransactionExecutionResult::NotExecuted( + TransactionError::InvalidProgramForExecution, + )); let flattened_result = execution_result.flattened_result(); let (logs, return_data, inner_instructions) = match execution_result { TransactionExecutionResult::Executed { details, .. } => (