From 5b59930782879ea90a78b8a35131d03d966adc4b Mon Sep 17 00:00:00 2001 From: Dmitri Makarov Date: Wed, 24 Jan 2024 20:28:25 -0500 Subject: [PATCH] Refactoring internal bank method signature for consistency (#34936) --- runtime/src/bank.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 07677bea49..e6f188b66a 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -4431,9 +4431,9 @@ impl Bank { self.rc.accounts.accounts_db.set_shrink_paths(paths); } - fn check_age<'a>( + fn check_age( &self, - txs: impl Iterator + 'a)>, + sanitized_txs: &[impl core::borrow::Borrow], lock_results: &[Result<()>], max_age: usize, error_counters: &mut TransactionErrorMetrics, @@ -4442,7 +4442,9 @@ impl Bank { let last_blockhash = hash_queue.last_hash(); let next_durable_nonce = DurableNonce::from_blockhash(&last_blockhash); - txs.zip(lock_results) + sanitized_txs + .iter() + .zip(lock_results) .map(|(tx, lock_res)| match lock_res { Ok(()) => self.check_transaction_age( tx.borrow(), @@ -4560,9 +4562,8 @@ impl Bank { max_age: usize, error_counters: &mut TransactionErrorMetrics, ) -> Vec { - let age_results = - self.check_age(sanitized_txs.iter(), lock_results, max_age, error_counters); - self.check_status_cache(sanitized_txs, age_results, error_counters) + let lock_results = self.check_age(sanitized_txs, lock_results, max_age, error_counters); + self.check_status_cache(sanitized_txs, lock_results, error_counters) } pub fn collect_balances(&self, batch: &TransactionBatch) -> TransactionBalances {