From 7d765e03b04fe7c5997e526dc78593a01c6d665c Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 28 Apr 2023 16:25:08 -0700 Subject: [PATCH] added in some cuddling changes to address the linter / CI test fails --- core/tx_list.go | 2 ++ eth/fetcher/tx_fetcher.go | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/tx_list.go b/core/tx_list.go index fea4434b9b..1540e042da 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -512,7 +512,9 @@ func (l *txList) Filter(costLimit *uint256.Int, gasLimit uint64) (types.Transact } invalids = l.txs.filter(func(tx *types.Transaction) bool { return tx.Nonce() > lowest }) } + l.txs.reheap() + return removed, invalids } diff --git a/eth/fetcher/tx_fetcher.go b/eth/fetcher/tx_fetcher.go index c147b7c50a..81f28d66d3 100644 --- a/eth/fetcher/tx_fetcher.go +++ b/eth/fetcher/tx_fetcher.go @@ -719,9 +719,10 @@ func (f *TxFetcher) rescheduleWait(timer *mclock.Timer, trigger chan struct{}) { } } } - *timer = f.clock.AfterFunc(f.txArrivalWait-time.Duration(now-earliest), func() { - trigger <- struct{}{} - }) + *timer = f.clock.AfterFunc( + f.txArrivalWait-time.Duration(now-earliest), + func() { trigger <- struct{}{} }, + ) } // rescheduleTimeout iterates over all the transactions currently in flight and