updates

Author: julienrbrt

block/errors.go

@@ -2,7 +2,6 @@ package block
 
 import (
 	"errors"
-	"fmt"
 )
 
 // These errors are used by Manager.
@@ -19,16 +18,3 @@ var (
 	// ErrHeightFromFutureStr is the error message for height from future returned by da
 	ErrHeightFromFutureStr = errors.New("given height is from the future")
 )
-
-// SaveBlockError is returned on failure to save block data
-type SaveBlockError struct {
-	Err error
-}
-
-func (e SaveBlockError) Error() string {
-	return fmt.Sprintf("failed to save block: %v", e.Err)
-}
-
-func (e SaveBlockError) Unwrap() error {
-	return e.Err
-}

block/lazy_aggregation_test.go

@@ -99,7 +99,7 @@ func TestLazyAggregationLoop_BlockTimerTrigger(t *testing.T) {
 		defer wg.Done()
 		blockTimer := time.NewTimer(0) // Fire immediately first time
 		defer blockTimer.Stop()
-		m.lazyAggregationLoop(ctx, blockTimer)
+		require.NoError(m.lazyAggregationLoop(ctx, blockTimer))
 	}()
 
 	// Wait for at least one block to be published
@@ -137,7 +137,7 @@ func TestLazyAggregationLoop_LazyTimerTrigger(t *testing.T) {
 		// Use real timers for this test
 		blockTimer := time.NewTimer(0) // Fire immediately first time
 		defer blockTimer.Stop()
-		m.lazyAggregationLoop(ctx, blockTimer)
+		require.NoError(m.lazyAggregationLoop(ctx, blockTimer))
 	}()
 
 	// Wait for the first publish call triggered by the initial immediate lazyTimer fire
@@ -186,7 +186,7 @@ func TestLazyAggregationLoop_PublishError(t *testing.T) {
 		// Use real timers
 		blockTimer := time.NewTimer(0)
 		defer blockTimer.Stop()
-		m.lazyAggregationLoop(ctx, blockTimer)
+		require.Error(m.lazyAggregationLoop(ctx, blockTimer))
 	}()
 
 	// Wait for the first publish attempt (which will fail)
@@ -267,7 +267,7 @@ func TestLazyAggregationLoop_TxNotification(t *testing.T) {
 		// Start with a timer that won't fire immediately
 		blockTimer := time.NewTimer(blockTime)
 		defer blockTimer.Stop()
-		m.lazyAggregationLoop(ctx, blockTimer)
+		require.NoError(m.lazyAggregationLoop(ctx, blockTimer))
 	}()
 
 	// Wait for the initial lazy timer to fire and publish a block
@@ -342,7 +342,7 @@ func TestEmptyBlockCreation(t *testing.T) {
 	defer blockTimer.Stop()
 
 	// Call produceBlock directly to test empty block creation
-	m.produceBlock(ctx, "test_trigger", lazyTimer, blockTimer)
+	require.NoError(m.produceBlock(ctx, "test_trigger", lazyTimer, blockTimer))
 
 	// Verify that the context was passed correctly
 	require.NotNil(capturedCtx, "Context should have been captured by mock publish function")
@@ -370,7 +370,7 @@ func TestNormalAggregationLoop_TxNotification(t *testing.T) {
 		defer wg.Done()
 		blockTimer := time.NewTimer(blockTime)
 		defer blockTimer.Stop()
-		m.normalAggregationLoop(ctx, blockTimer)
+		require.NoError(m.normalAggregationLoop(ctx, blockTimer))
 	}()
 
 	// Wait for the first block to be published by the timer

block/manager.go

@@ -507,8 +507,8 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 	}
 
 	if m.config.Node.MaxPendingHeaders != 0 && m.pendingHeaders.numPendingHeaders() >= m.config.Node.MaxPendingHeaders {
-		return fmt.Errorf("refusing to create block: pending blocks [%d] reached limit [%d]",
-			m.pendingHeaders.numPendingHeaders(), m.config.Node.MaxPendingHeaders)
+		m.logger.Warn("refusing to create block: pending blocks [%d] reached limit [%d]", m.pendingHeaders.numPendingHeaders(), m.config.Node.MaxPendingHeaders)
+		return nil
 	}
 
 	var (
@@ -566,7 +566,8 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 				}
 				m.logger.Info("Creating empty block", "height", newHeight)
 			} else {
-				return fmt.Errorf("failed to get transactions from batch: %w", err)
+				m.logger.Warn("failed to get transactions from batch", "error", err)
+				return nil
 			}
 		} else {
 			if batchData.Before(lastHeaderTime) {
@@ -582,7 +583,7 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 		}
 
 		if err = m.store.SaveBlockData(ctx, header, data, &signature); err != nil {
-			return SaveBlockError{err}
+			return fmt.Errorf("failed to save block: %w", err)
 		}
 	}
 
@@ -624,7 +625,7 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 	// SaveBlock commits the DB tx
 	err = m.store.SaveBlockData(ctx, header, data, &signature)
 	if err != nil {
-		return SaveBlockError{err}
+		return fmt.Errorf("failed to save block: %w", err)
 	}
 
 	// Update the store height before submitting to the DA layer but after committing to the DB

block/sync.go

@@ -163,7 +163,7 @@ func (m *Manager) trySyncNextBlock(ctx context.Context, daHeight uint64) error {
 		}
 
 		if err = m.store.SaveBlockData(ctx, h, d, &h.Signature); err != nil {
-			return SaveBlockError{err}
+			return fmt.Errorf("failed to save block: %w", err)
 		}
 
 		// Height gets updated