From 7d33ed787e976d438ff3cc6584cd10f7e618433c Mon Sep 17 00:00:00 2001
From: Andrew Fitzgerald <apfitzge@gmail.com>
Date: Fri, 26 Jul 2024 10:59:40 -0400
Subject: [PATCH] generic load_accounts

---
 svm/src/account_loader.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs
index 9e5d1f6be72a2d..4004b6c4d6fb07 100644
--- a/svm/src/account_loader.rs
+++ b/svm/src/account_loader.rs
@@ -23,7 +23,7 @@ use {
             self,
             instructions::{construct_instructions_data, BorrowedAccountMeta, BorrowedInstruction},
         },
-        transaction::{Result, SanitizedTransaction, TransactionError},
+        transaction::{Result, TransactionError},
         transaction_context::{IndexOfAccount, TransactionAccount},
     },
     solana_svm_transaction::svm_message::SVMMessage,
@@ -158,7 +158,7 @@ pub fn validate_fee_payer(
 /// second element.
 pub(crate) fn load_accounts<CB: TransactionProcessingCallback>(
     callbacks: &CB,
-    txs: &[SanitizedTransaction],
+    txs: &[impl SVMMessage],
     validation_results: Vec<TransactionValidationResult>,
     error_metrics: &mut TransactionErrorMetrics,
     account_overrides: Option<&AccountOverrides>,
@@ -170,12 +170,10 @@ pub(crate) fn load_accounts<CB: TransactionProcessingCallback>(
         .zip(validation_results)
         .map(|etx| match etx {
             (tx, Ok(tx_details)) => {
-                let message = tx.message();
-
                 // load transactions
                 load_transaction_accounts(
                     callbacks,
-                    message,
+                    tx,
                     tx_details,
                     error_metrics,
                     account_overrides,