blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SVM: rename TransactionCheckResult variable for consistency (#759)

This commit is contained in:
dmakarov 2024-04-11 15:46:23 -04:00 committed by GitHub
parent e9f8fcb4e6
commit ad94732d4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
svm/src/account_loader.rs
View File

@ -110,7 +110,7 @@ pub fn validate_fee_payer(
pub(crate) fn load_accounts<CB: TransactionProcessingCallback>( pub(crate) fn load_accounts<CB: TransactionProcessingCallback>(
callbacks: &CB, callbacks: &CB,
txs: &[SanitizedTransaction], txs: &[SanitizedTransaction],
lock_results: &[TransactionCheckResult], check_results: &[TransactionCheckResult],
error_counters: &mut TransactionErrorMetrics, error_counters: &mut TransactionErrorMetrics,
fee_structure: &FeeStructure, fee_structure: &FeeStructure,
account_overrides: Option<&AccountOverrides>, account_overrides: Option<&AccountOverrides>,
@ -119,7 +119,7 @@ pub(crate) fn load_accounts<CB: TransactionProcessingCallback>(
) -> Vec<TransactionLoadResult> { ) -> Vec<TransactionLoadResult> {
let feature_set = callbacks.get_feature_set(); let feature_set = callbacks.get_feature_set();
txs.iter() txs.iter()
.zip(lock_results) .zip(check_results)
.map(|etx| match etx { .map(|etx| match etx {
(tx, (Ok(()), nonce, lamports_per_signature)) => { (tx, (Ok(()), nonce, lamports_per_signature)) => {
let message = tx.message(); let message = tx.message();
@ -2135,13 +2135,13 @@ mod tests {
vec![Signature::new_unique()], vec![Signature::new_unique()],
false, false,
); );
let lock_results = let check_result =
(Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult; (Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult;
let results = load_accounts( let results = load_accounts(
&mock_bank, &mock_bank,
&[sanitized_transaction], &[sanitized_transaction],
&[lock_results], &[check_result],
&mut error_counter, &mut error_counter,
&FeeStructure::default(), &FeeStructure::default(),
None, None,
@ -2210,13 +2210,13 @@ mod tests {
false, 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 fee_structure = FeeStructure::default();
let result = load_accounts( let result = load_accounts(
&mock_bank, &mock_bank,
&[sanitized_transaction.clone()], &[sanitized_transaction.clone()],
&[lock_results], &[check_result],
&mut TransactionErrorMetrics::default(), &mut TransactionErrorMetrics::default(),
&fee_structure, &fee_structure,
None, None,
@ -2229,13 +2229,13 @@ mod tests {
vec![(Err(TransactionError::BlockhashNotFound), None)] vec![(Err(TransactionError::BlockhashNotFound), None)]
); );
let lock_results = let check_result =
(Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult; (Ok(()), Some(NoncePartial::default()), Some(20u64)) as TransactionCheckResult;
let result = load_accounts( let result = load_accounts(
&mock_bank, &mock_bank,
&[sanitized_transaction.clone()], &[sanitized_transaction.clone()],
&[lock_results.clone()], &[check_result.clone()],
&mut TransactionErrorMetrics::default(), &mut TransactionErrorMetrics::default(),
&fee_structure, &fee_structure,
None, None,
@ -2245,7 +2245,7 @@ mod tests {
assert_eq!(result, vec![(Err(TransactionError::AccountNotFound), None)]); assert_eq!(result, vec![(Err(TransactionError::AccountNotFound), None)]);
let lock_results = ( let check_result = (
Err(TransactionError::InvalidWritableAccount), Err(TransactionError::InvalidWritableAccount),
Some(NoncePartial::default()), Some(NoncePartial::default()),
Some(20u64), Some(20u64),
@ -2254,7 +2254,7 @@ mod tests {
let result = load_accounts( let result = load_accounts(
&mock_bank, &mock_bank,
&[sanitized_transaction.clone()], &[sanitized_transaction.clone()],
&[lock_results], &[check_result],
&mut TransactionErrorMetrics::default(), &mut TransactionErrorMetrics::default(),
&fee_structure, &fee_structure,
None, None,