add blockexecutiondata tests, fix indexer tests

Author: peterargue

module/executiondatasync/execution_data/execution_data_test.go

@@ -7,8 +7,42 @@ import (
 
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/executiondatasync/execution_data"
+	"github.com/onflow/flow-go/utils/unittest/fixtures"
 )
 
+func TestBlockExecutionDataHelpers(t *testing.T) {
+	g := fixtures.NewGeneratorSuite()
+	chunkDatas := g.ChunkExecutionDatas().List(5)
+	blockData := g.BlockExecutionDatas().Fixture(
+		fixtures.BlockExecutionData.WithChunkExecutionDatas(chunkDatas...),
+	)
+
+	expectedStardardChunks := chunkDatas[:len(chunkDatas)-1]
+	expectedStandardCollections := make([]*flow.Collection, len(expectedStardardChunks))
+	for i, chunk := range expectedStardardChunks {
+		expectedStandardCollections[i] = chunk.Collection
+	}
+
+	expectedSystemChunk := chunkDatas[len(chunkDatas)-1]
+	expectedSystemCollection := expectedSystemChunk.Collection
+
+	t.Run("StandardChunks", func(t *testing.T) {
+		assert.Equal(t, blockData.StandardChunks(), expectedStardardChunks)
+	})
+
+	t.Run("StandardCollections", func(t *testing.T) {
+		assert.Equal(t, blockData.StandardCollections(), expectedStandardCollections)
+	})
+
+	t.Run("SystemChunk", func(t *testing.T) {
+		assert.Equal(t, blockData.SystemChunk(), expectedSystemChunk)
+	})
+
+	t.Run("SystemCollection", func(t *testing.T) {
+		assert.Equal(t, blockData.SystemCollection(), expectedSystemCollection)
+	})
+}
+
 func TestConvertTransactionResults(t *testing.T) {
 	t.Parallel()
 

module/state_synchronization/indexer/indexer_core_test.go

@@ -250,9 +250,7 @@ func TestExecutionState_IndexBlockData(t *testing.T) {
 				assert.ElementsMatch(t, tf.ExpectedRegisterEntries, entries)
 			}).
 			Return(nil)
-		for _, collection := range tf.ExpectedCollections {
-			test.collectionIndexer.On("OnCollectionReceived", collection).Once()
-		}
+		test.collectionIndexer.On("IndexCollections", tf.ExpectedCollections).Return(nil).Once()
 		for txID, scheduledTxID := range tf.ExpectedScheduledTransactions {
 			test.scheduledTransactions.On("BatchIndex", mock.Anything, blockID, txID, scheduledTxID, mock.Anything).
 				Return(func(lctx lockctx.Proof, blockID flow.Identifier, txID flow.Identifier, scheduledTxID uint64, batch storage.ReaderBatchWriter) error {

module/state_synchronization/indexer/indexer_test.go

@@ -201,7 +201,7 @@ func TestIndexer_Success(t *testing.T) {
 			})
 
 		test.executionData.On("Get", blockID).Return(ed, true).Once()
-		test.indexTest.collectionIndexer.On("OnCollectionReceived", collection).Return(nil).Once()
+		test.indexTest.collectionIndexer.On("IndexCollections", ed.StandardCollections()).Return(nil).Once()
 		test.indexTest.registers.On("Store", flow.RegisterEntries{}, block.Height).Return(nil).Once()
 	}
 
@@ -243,7 +243,7 @@ func TestIndexer_Failure(t *testing.T) {
 			})
 
 		test.executionData.On("Get", blockID).Return(ed, true).Once()
-		test.indexTest.collectionIndexer.On("OnCollectionReceived", collection).Return(nil).Once()
+		test.indexTest.collectionIndexer.On("IndexCollections", ed.StandardCollections()).Return(nil).Once()
 
 		// return an error on the last block to trigger the error path
 		if block.Height == lastHeight {