Skip to content

Commit

Permalink
generic execute_batch
Browse files Browse the repository at this point in the history
  • Loading branch information
apfitzge committed Nov 4, 2024
1 parent 368a2e4 commit 9f6ae8e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ledger/src/blockstore_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ use {
transaction_commit_result::{TransactionCommitResult, TransactionCommitResultExtensions},
transaction_processor::ExecutionRecordingConfig,
},
solana_svm_transaction::svm_message::SVMMessage,
solana_svm_transaction::{svm_message::SVMMessage, svm_transaction::SVMTransaction},
solana_timings::{report_execute_timings, ExecuteTimingType, ExecuteTimings},
solana_transaction_status::token_balances::TransactionTokenBalancesSet,
solana_vote::vote_account::VoteAccountsHashMap,
Expand Down Expand Up @@ -109,7 +109,7 @@ fn first_err(results: &[Result<()>]) -> Result<()> {

// Includes transaction signature for unit-testing
fn get_first_error(
batch: &TransactionBatch<SanitizedTransaction>,
batch: &TransactionBatch<impl SVMTransaction>,
commit_results: &[TransactionCommitResult],
) -> Option<(Result<()>, Signature)> {
let mut first_err = None;
Expand Down Expand Up @@ -144,7 +144,7 @@ fn create_thread_pool(num_threads: usize) -> ThreadPool {
}

pub fn execute_batch(
batch: &TransactionBatchWithIndexes<SanitizedTransaction>,
batch: &TransactionBatchWithIndexes<impl SVMTransactionAdapter>,
bank: &Arc<Bank>,
transaction_status_sender: Option<&TransactionStatusSender>,
replay_vote_sender: Option<&ReplayVoteSender>,
Expand Down Expand Up @@ -240,7 +240,7 @@ pub fn execute_batch(
fn check_block_cost_limits(
bank: &Bank,
commit_results: &[TransactionCommitResult],
sanitized_transactions: &[RuntimeTransaction<SanitizedTransaction>],
sanitized_transactions: &[RuntimeTransaction<impl SVMMessage>],
) -> Result<()> {
assert_eq!(sanitized_transactions.len(), commit_results.len());

Expand Down

0 comments on commit 9f6ae8e

Please sign in to comment.