v1.18: Remove unnecessary unwrap from `simulate_transaction_unchecked…

…()` (backport of solana-labs#35375) (solana-labs#35397) Remove unnecessary unwrap from `simulate_transaction_unchecked()` (solana-labs#35375) Remove unnecessary unwrap from simulate_transaction_unchecked() (cherry picked from commit cb260f1) Co-authored-by: Pankaj Garg <[email protected]>
anza-xyz · Mar 3, 2024 · 356c6a3 · 356c6a3
1 parent 994e81e
commit 356c6a3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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, .. } => (