From 356c6a38cfc8aedfe70d414a8d2a03210834aba0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 20:29:42 -0600
Subject: [PATCH] v1.18: Remove unnecessary unwrap from
 `simulate_transaction_unchecked()` (backport of #35375) (#35397)

Remove unnecessary unwrap from `simulate_transaction_unchecked()` (#35375)

Remove unnecessary unwrap from simulate_transaction_unchecked()

(cherry picked from commit cb260f10d1b05743391b9b442bf175c19d894931)

Co-authored-by: Pankaj Garg <pankaj@solana.com>
---
 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, .. } => (