From c4aa4624e40299313c527ae193fe8860b7a9e125 Mon Sep 17 00:00:00 2001 From: Domino Valdano <2644901+reductionista@users.noreply.github.com> Date: Wed, 2 Oct 2024 21:03:38 -0700 Subject: [PATCH] Revert countBasedPruningActive flag --- core/chains/evm/logpoller/log_poller.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go index 790983381e..eadfd0d28e 100644 --- a/core/chains/evm/logpoller/log_poller.go +++ b/core/chains/evm/logpoller/log_poller.go @@ -132,8 +132,7 @@ type logPoller struct { // Usually the only way to recover is to manually remove the offending logs and block from the database. // LogPoller keeps running in infinite loop, so whenever the invalid state is removed from the database it should // recover automatically without needing to restart the LogPoller. - finalityViolated *atomic.Bool - countBasedLogPruningActive *atomic.Bool + finalityViolated *atomic.Bool } type Opts struct { @@ -293,9 +292,6 @@ func (lp *logPoller) RegisterFilter(ctx context.Context, filter Filter) error { } lp.filters[filter.Name] = filter lp.filterDirty = true - if filter.MaxLogsKept > 0 { - lp.countBasedLogPruningActive.Store(true) - } return nil } @@ -1154,10 +1150,6 @@ func (lp *logPoller) PruneExpiredLogs(ctx context.Context) (bool, error) { done = false } - if !lp.countBasedLogPruningActive.Load() { - return done, err - } - rowIDs, err := lp.orm.SelectExcessLogIDs(ctx, lp.logPrunePageSize) if err != nil { lp.lggr.Errorw("Unable to find excess logs for pruning", "err", err)