fix build

solana-labs · Feb 26, 2024 · 8023d05 · 8023d05
1 parent 865029b
commit 8023d05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs
@@ -34,6 +34,7 @@ use {
         transaction_context::{IndexOfAccount, TransactionAccount},
     },
     solana_system_program::{get_system_account_kind, SystemAccountKind},
+    std::sync::RwLock,
     std::{collections::HashMap, num::NonZeroUsize},
 };
 
@@ -51,7 +52,7 @@ pub struct LoadedTransaction {
 pub type TransactionLoadResult = (Result<LoadedTransaction>, Option<NonceFull>);
 pub type TransactionCheckResult = (transaction::Result<()>, Option<NoncePartial>, Option<u64>);
 
-pub fn load_accounts<CB: TransactionProcessingCallback>(
+pub fn load_accounts<CB: TransactionProcessingCallback, AccountHash>(
     callbacks: &CB,
     txs: &[SanitizedTransaction],
     lock_results: &[TransactionCheckResult],
@@ -123,7 +124,7 @@ pub fn load_accounts<CB: TransactionProcessingCallback>(
         .collect()
 }
 
-fn load_transaction_accounts<CB: TransactionProcessingCallback>(
+fn load_transaction_accounts<CB: TransactionProcessingCallback, AccountHash>(
     callbacks: &CB,
     tx: &SanitizedTransaction,
     fee: u64,

diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs
@@ -177,7 +177,11 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
     }
 
     #[allow(clippy::too_many_arguments)]
-    pub fn load_and_execute_sanitized_transactions<'a, CB: TransactionProcessingCallback>(
+    pub fn load_and_execute_sanitized_transactions<
+        'a,
+        CB: TransactionProcessingCallback,
+        AccountHash,
+    >(
         &self,
         callbacks: &CB,
         sanitized_txs: &[SanitizedTransaction],