From ad94732d4f04cf4fe8f4e403769bd308bc4811ce Mon Sep 17 00:00:00 2001 From: dmakarov Date: Thu, 11 Apr 2024 15:46:23 -0400 Subject: [PATCH] SVM: rename TransactionCheckResult variable for consistency (#759) --- svm/src/account_loader.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs index e2d547126..8911f2882 100644 --- a/svm/src/account_loader.rs +++ b/svm/src/account_loader.rs @@ -110,7 +110,7 @@ pub fn validate_fee_payer( pub(crate) fn load_accounts( callbacks: &CB, txs: &[SanitizedTransaction], - lock_results: &[TransactionCheckResult], + check_results: &[TransactionCheckResult], error_counters: &mut TransactionErrorMetrics, fee_structure: &FeeStructure, account_overrides: Option<&AccountOverrides>, @@ -119,7 +119,7 @@ pub(crate) fn load_accounts( ) -> Vec { let feature_set = callbacks.get_feature_set(); txs.iter() - .zip(lock_results) + .zip(check_results) .map(|etx| match etx { (tx, (Ok(()), nonce, lamports_per_signature)) => { let message = tx.message(); @@ -2135,13 +2135,13 @@ mod tests { vec![Signature::new_unique()], false, ); - let lock_results = + let check_result = (Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult; let results = load_accounts( &mock_bank, &[sanitized_transaction], - &[lock_results], + &[check_result], &mut error_counter, &FeeStructure::default(), None, @@ -2210,13 +2210,13 @@ mod tests { false, ); - let lock_results = (Ok(()), Some(NoncePartial::default()), None) as TransactionCheckResult; + let check_result = (Ok(()), Some(NoncePartial::default()), None) as TransactionCheckResult; let fee_structure = FeeStructure::default(); let result = load_accounts( &mock_bank, &[sanitized_transaction.clone()], - &[lock_results], + &[check_result], &mut TransactionErrorMetrics::default(), &fee_structure, None, @@ -2229,13 +2229,13 @@ mod tests { vec![(Err(TransactionError::BlockhashNotFound), None)] ); - let lock_results = + let check_result = (Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult; let result = load_accounts( &mock_bank, &[sanitized_transaction.clone()], - &[lock_results.clone()], + &[check_result.clone()], &mut TransactionErrorMetrics::default(), &fee_structure, None, @@ -2245,7 +2245,7 @@ mod tests { assert_eq!(result, vec![(Err(TransactionError::AccountNotFound), None)]); - let lock_results = ( + let check_result = ( Err(TransactionError::InvalidWritableAccount), Some(NoncePartial::default()), Some(20u64), @@ -2254,7 +2254,7 @@ mod tests { let result = load_accounts( &mock_bank, &[sanitized_transaction.clone()], - &[lock_results], + &[check_result], &mut TransactionErrorMetrics::default(), &fee_structure, None,