add tests

Author: julienrbrt

block/internal/syncing/da_retriever.go

@@ -39,9 +39,9 @@ type DARetriever struct {
 
 	// transient cache, only full event need to be passed to the syncer
 	// on restart, will be refetch as da height is updated by syncer
-	pendingHeaders  map[uint64]*types.SignedHeader
-	pendingData     map[uint64]*types.Data
-	headerDAHeights map[uint64]uint64
+	pendingHeaders  map[uint64] /* header height */ *types.SignedHeader
+	pendingData     map[uint64] /* data height */ *types.Data
+	headerDAHeights map[uint64] /* header height */ uint64
 }
 
 // NewDARetriever creates a new DA retriever

block/internal/syncing/da_retriever_test.go

@@ -292,3 +292,78 @@ func TestDARetriever_ProcessBlobs_CrossDAHeightMatching(t *testing.T) {
 	require.NotContains(t, r.pendingData, uint64(5), "data should be removed from pending")
 	require.NotContains(t, r.headerDAHeights, uint64(5), "header DA height should be removed")
 }
+
+func TestDARetriever_ProcessBlobs_MultipleHeadersCrossDAHeightMatching(t *testing.T) {
+	ds := dssync.MutexWrap(datastore.NewMapDatastore())
+	st := store.New(ds)
+	cm, err := cache.NewManager(config.DefaultConfig(), st, zerolog.Nop())
+	require.NoError(t, err)
+
+	addr, pub, signer := buildSyncTestSigner(t)
+	gen := genesis.Genesis{ChainID: "tchain", InitialHeight: 1, StartTime: time.Now().Add(-time.Second), ProposerAddress: addr}
+
+	r := NewDARetriever(nil, cm, config.DefaultConfig(), gen, common.DefaultBlockOptions(), zerolog.Nop())
+
+	// Create multiple headers and data for different block heights
+	data3Bin, data3 := makeSignedDataBytes(t, gen.ChainID, 3, addr, pub, signer, 1)
+	data4Bin, data4 := makeSignedDataBytes(t, gen.ChainID, 4, addr, pub, signer, 2)
+	data5Bin, data5 := makeSignedDataBytes(t, gen.ChainID, 5, addr, pub, signer, 1)
+
+	hdr3Bin, _ := makeSignedHeaderBytes(t, gen.ChainID, 3, addr, pub, signer, nil, data3.Hash())
+	hdr4Bin, _ := makeSignedHeaderBytes(t, gen.ChainID, 4, addr, pub, signer, nil, data4.Hash())
+	hdr5Bin, _ := makeSignedHeaderBytes(t, gen.ChainID, 5, addr, pub, signer, nil, data5.Hash())
+
+	// Process multiple headers from DA height 200 - should be stored as pending
+	events1 := r.processBlobs(context.Background(), [][]byte{hdr3Bin, hdr4Bin, hdr5Bin}, 200)
+	require.Len(t, events1, 0, "should not create events yet - all data is missing")
+
+	// Verify all headers are stored in pending
+	require.Contains(t, r.pendingHeaders, uint64(3), "header 3 should be pending")
+	require.Contains(t, r.pendingHeaders, uint64(4), "header 4 should be pending")
+	require.Contains(t, r.pendingHeaders, uint64(5), "header 5 should be pending")
+	assert.Equal(t, uint64(200), r.headerDAHeights[3])
+	assert.Equal(t, uint64(200), r.headerDAHeights[4])
+	assert.Equal(t, uint64(200), r.headerDAHeights[5])
+
+	// Process some data from DA height 203 - should create partial events
+	events2 := r.processBlobs(context.Background(), [][]byte{data3Bin, data5Bin}, 203)
+	require.Len(t, events2, 2, "should create events for heights 3 and 5")
+
+	// Sort events by height for consistent testing
+	if events2[0].Header.Height() > events2[1].Header.Height() {
+		events2[0], events2[1] = events2[1], events2[0]
+	}
+
+	// Verify event for height 3
+	assert.Equal(t, uint64(3), events2[0].Header.Height())
+	assert.Equal(t, uint64(3), events2[0].Data.Height())
+	assert.Equal(t, uint64(203), events2[0].DaHeight)
+	assert.Equal(t, uint64(200), events2[0].HeaderDaIncludedHeight)
+
+	// Verify event for height 5
+	assert.Equal(t, uint64(5), events2[1].Header.Height())
+	assert.Equal(t, uint64(5), events2[1].Data.Height())
+	assert.Equal(t, uint64(203), events2[1].DaHeight)
+	assert.Equal(t, uint64(200), events2[1].HeaderDaIncludedHeight)
+
+	// Verify header 4 is still pending (no matching data yet)
+	require.Contains(t, r.pendingHeaders, uint64(4), "header 4 should still be pending")
+	require.NotContains(t, r.pendingHeaders, uint64(3), "header 3 should be removed from pending")
+	require.NotContains(t, r.pendingHeaders, uint64(5), "header 5 should be removed from pending")
+
+	// Process remaining data from DA height 205
+	events3 := r.processBlobs(context.Background(), [][]byte{data4Bin}, 205)
+	require.Len(t, events3, 1, "should create event for height 4")
+
+	// Verify final event for height 4
+	assert.Equal(t, uint64(4), events3[0].Header.Height())
+	assert.Equal(t, uint64(4), events3[0].Data.Height())
+	assert.Equal(t, uint64(205), events3[0].DaHeight)
+	assert.Equal(t, uint64(200), events3[0].HeaderDaIncludedHeight)
+
+	// Verify all pending maps are now clear
+	require.NotContains(t, r.pendingHeaders, uint64(4), "header 4 should be removed from pending")
+	require.Len(t, r.pendingHeaders, 0, "all headers should be processed")
+	require.Len(t, r.pendingData, 0, "all data should be processed")
+	require.Len(t, r.headerDAHeights, 0, "all header DA heights should be cleared")
+}