Review feedback

Author: alpe

block/internal/syncing/da_follower.go

@@ -325,11 +325,13 @@ func (f *daFollower) runCatchup(ctx context.Context) {
 		}
 
 		// Check for priority heights from P2P hints first.
-		if priorityHeight := f.retriever.PopPriorityHeight(); priorityHeight > 0 {
-			nextHeight := f.localNextDAHeight.Load()
-			if priorityHeight < nextHeight {
-				continue
-			}
+		// We drain stale hints to avoid a tight CPU loop if many are queued.
+		priorityHeight := f.retriever.PopPriorityHeight()
+		for priorityHeight > 0 && priorityHeight < f.localNextDAHeight.Load() {
+			priorityHeight = f.retriever.PopPriorityHeight()
+		}
+
+		if priorityHeight > 0 {
 			f.logger.Debug().
 				Uint64("da_height", priorityHeight).
 				Msg("fetching priority DA height from P2P hint")

block/internal/syncing/da_retriever_strict_test.go

@@ -70,21 +70,21 @@ func TestDARetriever_StrictEnvelopeMode_Switch(t *testing.T) {
 	// --- Test Scenario ---
 
 	// A. Initial State: StrictMode is false. Legacy blob should be accepted.
-	assert.False(t, r.strictMode)
+	assert.False(t, r.strictMode.Load())
 
 	decodedLegacy := r.tryDecodeHeader(legacyBlob, 100)
 	require.NotNil(t, decodedLegacy)
 	assert.Equal(t, uint64(1), decodedLegacy.Height())
 
 	// StrictMode should still be false because it was a legacy blob
-	assert.False(t, r.strictMode)
+	assert.False(t, r.strictMode.Load())
 
 	// B. Receiving Envelope: Should be accepted and Switch StrictMode to true.
 	decodedEnvelope := r.tryDecodeHeader(envelopeBlob, 101)
 	require.NotNil(t, decodedEnvelope)
 	assert.Equal(t, uint64(2), decodedEnvelope.Height())
 
-	assert.True(t, r.strictMode, "retriever should have switched to strict mode")
+	assert.True(t, r.strictMode.Load(), "retriever should have switched to strict mode")
 
 	// C. Receiving Legacy again: Should be REJECTED now.
 	// We reuse the same legacyBlob (or a new one, doesn't matter, structure is legacy).

test/testda/dummy.go

@@ -70,10 +70,10 @@ func (d *DummyDA) Subscribe(ctx context.Context, _ []byte) (<-chan datypes.Subsc
 		for i, s := range d.subscribers {
 			if s == sub {
 				d.subscribers = append(d.subscribers[:i], d.subscribers[i+1:]...)
+				close(ch)
 				break
 			}
 		}
-		close(ch)
 	}()
 
 	return ch, nil