From 7313b0f1ca18adf6411b3e2f9568a9fc3c6a5c59 Mon Sep 17 00:00:00 2001
From: hanako mumei <81144685+2501babe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 05:28:05 -0700
Subject: [PATCH] fix merge issues

---
 svm/src/account_loader.rs        | 8 ++++++--
 svm/src/transaction_processor.rs | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs
index 613f96333f04f5..b24b891db762f3 100644
--- a/svm/src/account_loader.rs
+++ b/svm/src/account_loader.rs
@@ -5,7 +5,7 @@ use {
         nonce_info::NonceInfo,
         rollback_accounts::RollbackAccounts,
         transaction_error_metrics::TransactionErrorMetrics,
-        transaction_processing_callback::{AccountState, TransactionProcessingCallback},
+        transaction_processing_callback::{/* XXX AccountState, */ TransactionProcessingCallback,},
     },
     itertools::Itertools,
     solana_compute_budget::compute_budget_limits::ComputeBudgetLimits,
@@ -472,7 +472,7 @@ fn load_transaction_account(
     loaded_programs: &ProgramCacheForTxBatch,
 ) -> Result<(LoadedTransactionAccount, bool)> {
     let mut account_found = true;
-    let mut was_inspected = false;
+    let mut _was_inspected = false;
     let is_instruction_account = u8::try_from(account_index)
         .map(|i| instruction_accounts.contains(&&i))
         .unwrap_or(false);
@@ -507,6 +507,7 @@ fn load_transaction_account(
                 let rent_collected = if is_writable {
                     // Inspect the account prior to collecting rent, since
                     // rent collection can modify the account.
+                    /* XXX HANA i messaged brooks asking what this is... newly added yesterday 8/22
                     debug_assert!(!was_inspected);
                     callbacks.inspect_account(
                         account_key,
@@ -514,6 +515,7 @@ fn load_transaction_account(
                         is_writable,
                     );
                     was_inspected = true;
+                    */
 
                     collect_rent_from_account(
                         feature_set,
@@ -547,6 +549,7 @@ fn load_transaction_account(
             })
     };
 
+    /* XXX as noted above
     if !was_inspected {
         let account_state = if account_found {
             AccountState::Alive(&loaded_account.account)
@@ -555,6 +558,7 @@ fn load_transaction_account(
         };
         callbacks.inspect_account(account_key, account_state, is_writable);
     }
+    */
 
     Ok((loaded_account, account_found))
 }
diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs
index 7a25acacdb5c38..6ad1d1f035ee54 100644
--- a/svm/src/transaction_processor.rs
+++ b/svm/src/transaction_processor.rs
@@ -317,7 +317,7 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
                     } else {
                         Err(fees_only_tx.load_error)
                     }
-                },
+                }
                 TransactionLoadResult::Loaded(loaded_transaction) => {
                     let executed_tx = self.execute_loaded_transaction(
                         tx,
@@ -337,7 +337,7 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
                         program_cache_for_tx_batch.merge(&executed_tx.programs_modified_by_tx);
                     }
 
-                    Ok(executed_tx)
+                    Ok(ProcessedTransaction::Executed(Box::new(executed_tx)))
                 }
             };