From d7d0169646de2f32b48892b6b2830ce1763536f2 Mon Sep 17 00:00:00 2001
From: Domino Valdano <2644901+reductionista@users.noreply.github.com>
Date: Wed, 3 Apr 2024 08:36:44 -0700
Subject: [PATCH] .

---
 core/chains/evm/logpoller/log_poller.go               | 2 +-
 core/chains/evm/logpoller/log_poller_internal_test.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index 899ba881b7f..326aa1bb3a4 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -700,7 +700,7 @@ func (lp *logPoller) BackupPollAndSaveLogs(ctx context.Context) {
 			return
 		}
 		// If this is our first run, start from block min(lastProcessed.FinalizedBlockNumber-1, lastProcessed.BlockNumber-backupPollerBlockDelay)
-		backupStartBlock := mathutil.Min(lastProcessed.FinalizedBlockNumber-1, lastProcessed.BlockNumber-lp.backupPollerBlockDelay)
+		backupStartBlock := mathutil.Min(lastProcessed.FinalizedBlockNumber, lastProcessed.BlockNumber-lp.backupPollerBlockDelay)
 		// (or at block 0 if whole blockchain is too short)
 		lp.backupPollerNextBlock = mathutil.Max(backupStartBlock, 0)
 	}
diff --git a/core/chains/evm/logpoller/log_poller_internal_test.go b/core/chains/evm/logpoller/log_poller_internal_test.go
index 15b55d9e4b8..e28f45b4b6d 100644
--- a/core/chains/evm/logpoller/log_poller_internal_test.go
+++ b/core/chains/evm/logpoller/log_poller_internal_test.go
@@ -233,7 +233,7 @@ func TestLogPoller_BackupPollerStartup(t *testing.T) {
 		BackfillBatchSize:        3,
 		RpcBatchSize:             2,
 		KeepFinalizedBlocksDepth: 1000,
-		BackupPollerBlockDelay:   3,
+		BackupPollerBlockDelay:   0,
 	}
 	lp := NewLogPoller(orm, ec, lggr, lpOpts)
 	lp.BackupPollAndSaveLogs(ctx)
@@ -299,7 +299,6 @@ func TestLogPoller_Replay(t *testing.T) {
 	ec.On("HeadByNumber", mock.Anything, mock.Anything).Return(&head, nil)
 	ec.On("FilterLogs", mock.Anything, mock.Anything).Return([]types.Log{log1}, nil).Twice()
 	ec.On("ConfiguredChainID").Return(chainID, nil)
-	mockBatchCallContext(t, ec)
 
 	lpOpts := Opts{
 		PollPeriod:               time.Hour,
@@ -307,7 +306,7 @@ func TestLogPoller_Replay(t *testing.T) {
 		BackfillBatchSize:        3,
 		RpcBatchSize:             3,
 		KeepFinalizedBlocksDepth: 20,
-		BackupPollerBlockDelay:   100,
+		BackupPollerBlockDelay:   0,
 	}
 	lp := NewLogPoller(orm, ec, lggr, lpOpts)
 
@@ -337,6 +336,7 @@ func TestLogPoller_Replay(t *testing.T) {
 
 	// Replay() should return error code received from replayComplete
 	t.Run("returns error code on replay complete", func(t *testing.T) {
+		mockBatchCallContext(t, ec)
 		anyErr := pkgerrors.New("any error")
 		done := make(chan struct{})
 		go func() {