From d273d1acb21f7317b2a0f8039a549eb5405481e6 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2020 10:36:56 +0000 Subject: [PATCH] Fix forwarding calculation (#12014) (#12019) Co-authored-by: Carl (cherry picked from commit 3f39ab1e044a593cf97dd79a812feb8c45f6d324) Co-authored-by: carllin --- core/src/banking_stage.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index 6e1b43a002..642c2855f7 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -30,8 +30,8 @@ use solana_runtime::{ }; use solana_sdk::{ clock::{ - Slot, DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE, - MAX_TRANSACTION_FORWARDING_DELAY, MAX_TRANSACTION_FORWARDING_DELAY_GPU, + Slot, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE, MAX_TRANSACTION_FORWARDING_DELAY, + MAX_TRANSACTION_FORWARDING_DELAY_GPU, }, poh_config::PohConfig, pubkey::Pubkey, @@ -768,10 +768,7 @@ impl BankingStage { &filter, (MAX_PROCESSING_AGE) .saturating_sub(max_tx_fwd_delay) - .saturating_sub( - (FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET * bank.ticks_per_slot() - / DEFAULT_TICKS_PER_SECOND) as usize, - ), + .saturating_sub(FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET as usize), &mut error_counters, );