fix integration test

Author: peterargue

cmd/observer/node_builder/observer_builder.go

@@ -1921,7 +1921,7 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() {
 		// handles block-related operations.
 		blockTracker, err := subscriptiontracker.NewBlockTracker(
 			node.State,
-			builder.FinalizedRootBlock.Height,
+			builder.SealedRootBlock.Height,
 			node.Storage.Headers,
 			broadcaster,
 		)

engine/common/rpc/convert/blocks.go

@@ -78,6 +78,20 @@ func MessageToBlock(m *entities.Block) (*flow.Block, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert block header: %w", err)
 	}
+
+	if IsRootBlockHeader(m.BlockHeader) {
+		block, err := flow.NewRootBlock(
+			flow.UntrustedBlock{
+				HeaderBody: header.HeaderBody,
+				Payload:    *payload,
+			},
+		)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create root header: %w", err)
+		}
+		return block, nil
+	}
+
 	block, err := flow.NewBlock(
 		flow.UntrustedBlock{
 			HeaderBody: header.HeaderBody,

engine/common/rpc/convert/blocks_test.go

@@ -60,3 +60,19 @@ func TestConvertBlockLight(t *testing.T) {
 	assert.Len(t, msg.ExecutionReceiptMetaList, 0)
 	assert.Len(t, msg.ExecutionResultList, 0)
 }
+
+// TestConvertRootBlock tests that converting a root block to and from a protobuf message results in
+// the same block
+func TestConvertRootBlock(t *testing.T) {
+	t.Parallel()
+
+	block := unittest.Block.Genesis(flow.Emulator)
+
+	msg, err := convert.BlockToMessage(block, flow.IdentifierList{})
+	require.NoError(t, err)
+
+	converted, err := convert.MessageToBlock(msg)
+	require.NoError(t, err)
+
+	assert.Equal(t, block.ID(), converted.ID())
+}

engine/common/rpc/convert/headers_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/flow-go/engine/common/rpc/convert"
+	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
@@ -27,3 +28,19 @@ func TestConvertBlockHeader(t *testing.T) {
 
 	assert.Equal(t, header, converted)
 }
+
+// TestConvertRootBlockHeader tests that converting a root block header to and from a protobuf message
+// results in the same block
+func TestConvertRootBlockHeader(t *testing.T) {
+	t.Parallel()
+
+	header := unittest.Block.Genesis(flow.Emulator).ToHeader()
+
+	msg, err := convert.BlockHeaderToMessage(header, flow.IdentifierList{})
+	require.NoError(t, err)
+
+	converted, err := convert.MessageToBlockHeader(msg)
+	require.NoError(t, err)
+
+	assert.Equal(t, header.ID(), converted.ID())
+}