feedback 2/2

Author: julienrbrt

sequencers/based/sequencer.go

@@ -75,12 +75,7 @@ func (s *BasedSequencer) GetNextBatch(ctx context.Context, req coresequencer.Get
 	if err != nil {
 		// Check if forced inclusion is not configured
 		if errors.Is(err, block.ErrForceInclusionNotConfigured) {
-			s.logger.Error().Msg("forced inclusion not configured, returning empty batch")
-			return &coresequencer.GetNextBatchResponse{
-				Batch:     &coresequencer.Batch{Transactions: nil},
-				Timestamp: time.Now(),
-				BatchData: req.LastBatchData,
-			}, nil
+			return nil, errors.New("forced inclusion not configured, returning empty batch")
 		} else if errors.Is(err, coreda.ErrHeightFromFuture) {
 			// If we get a height from future error, keep the current DA height and return batch
 			// We'll retry the same height on the next call until DA produces that block

sequencers/based/sequencer_test.go

@@ -236,10 +236,8 @@ func TestBasedSequencer_GetNextBatch_NotConfigured(t *testing.T) {
 	}
 
 	resp, err := seq.GetNextBatch(context.Background(), req)
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Batch)
-	assert.Equal(t, 0, len(resp.Batch.Transactions))
+	require.Error(t, err)
+	require.Nil(t, resp)
 }
 
 func TestBasedSequencer_GetNextBatch_WithMaxBytes(t *testing.T) {

sequencers/single/queue.go

@@ -85,8 +85,7 @@ func (bq *BatchQueue) AddBatch(ctx context.Context, batch coresequencer.Batch) e
 
 // Prepend adds a batch to the front of the queue (before head position).
 // This is used to return transactions that couldn't fit in the current batch.
-// The batch is NOT persisted to the DB since these are transactions that were
-// already in the queue or were just processed.
+// TODO(@julienrbrt): The batch is currently NOT persisted to the DB since these are transactions that were already in the queue or were just processed. -- FI txs are lost, this should be tackled.
 func (bq *BatchQueue) Prepend(ctx context.Context, batch coresequencer.Batch) error {
 	bq.mu.Lock()
 	defer bq.mu.Unlock()