From 888fa14c450ca1d6ea91929eb6be7da5104dbb52 Mon Sep 17 00:00:00 2001
From: Jake Loo <2171134+jakeloo@users.noreply.github.com>
Date: Sat, 30 Aug 2025 07:36:06 +0000
Subject: [PATCH] Update error messages

---
 internal/orchestrator/poller.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/internal/orchestrator/poller.go b/internal/orchestrator/poller.go
index 265a8cac..b0b60f43 100644
--- a/internal/orchestrator/poller.go
+++ b/internal/orchestrator/poller.go
@@ -87,6 +87,7 @@ func NewPoller(rpc rpc.IRPCClient, storage storage.IStorage, opts ...PollerOptio
 }
 
 var ErrNoNewBlocks = fmt.Errorf("no new blocks to poll")
+var ErrBlocksProcessed = fmt.Errorf("blocks are being processed")
 
 func (p *Poller) Start(ctx context.Context) {
 	log.Debug().Msgf("Poller running with %d workers", p.parallelPollers)
@@ -118,7 +119,7 @@ func (p *Poller) poll(ctx context.Context, blockNumbers []*big.Int) ([]common.Bl
 	p.processingRangesMutex.RUnlock()
 
 	if isProcessing {
-		return nil, fmt.Errorf("range %s already being processed", rangeKey)
+		return nil, ErrBlocksProcessed
 	}
 
 	p.markRangeAsProcessing(rangeKey)
@@ -167,7 +168,9 @@ func (p *Poller) Request(ctx context.Context, blockNumbers []*big.Int) []common.
 	// Process and cache the requested range
 	blockData, err := p.poll(ctx, blockNumbers)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to poll blocks")
+		if err != ErrBlocksProcessed && err != ErrNoNewBlocks {
+			log.Error().Err(err).Msgf("Error polling requested blocks: %s - %s", blockNumbers[0].String(), endBlock.String())
+		}
 		return nil
 	}
 
@@ -265,9 +268,11 @@ func (p *Poller) processBatch(blockNumbers []*big.Int) {
 
 	_, err := p.poll(p.ctx, blockNumbers)
 	if err != nil {
-		if len(blockNumbers) > 0 {
-			startBlock, endBlock := blockNumbers[0], blockNumbers[len(blockNumbers)-1]
-			log.Debug().Err(err).Msgf("Failed to poll blocks %s-%s", startBlock.String(), endBlock.String())
+		if err != ErrBlocksProcessed && err != ErrNoNewBlocks {
+			if len(blockNumbers) > 0 {
+				startBlock, endBlock := blockNumbers[0], blockNumbers[len(blockNumbers)-1]
+				log.Debug().Err(err).Msgf("Failed to poll blocks %s-%s", startBlock.String(), endBlock.String())
+			}
 		}
 		return
 	}