Merge pull request #870 from iotaledger/fix/inx-blockMetadata

Return accepted/confirmed in ListenToAcceptedBlocks and ListenToConfirmedBlocks
iotaledger · Mar 25, 2024 · acb7eeb · acb7eeb
2 parents 4499ef0 + d71065b
commit acb7eeb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/components/inx/server_blocks.go b/components/inx/server_blocks.go
@@ -14,6 +14,7 @@ import (
 	"github.com/iotaledger/iota-core/pkg/model"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/blocks"
 	iotago "github.com/iotaledger/iota.go/v4"
+	"github.com/iotaledger/iota.go/v4/api"
 )
 
 func (s *Server) ReadActiveRootBlocks(_ context.Context, _ *inx.NoParams) (*inx.RootBlocksResponse, error) {
@@ -78,7 +79,10 @@ func (s *Server) ListenToAcceptedBlocks(_ *inx.NoParams, srv inx.INX_ListenToAcc
 	wp := workerpool.New("ListenToAcceptedBlocks", workerpool.WithWorkerCount(workerCount)).Start()
 
 	unhook := deps.Protocol.Events.Engine.BlockGadget.BlockAccepted.Hook(func(block *blocks.Block) {
-		payload, err := getINXBlockMetadata(block.ID())
+		payload, err := inx.WrapBlockMetadata(&api.BlockMetadataResponse{
+			BlockID:    block.ID(),
+			BlockState: api.BlockStateAccepted,
+		})
 		if err != nil {
 			Component.LogErrorf("get block metadata error: %v", err)
 			cancel()
@@ -115,7 +119,10 @@ func (s *Server) ListenToConfirmedBlocks(_ *inx.NoParams, srv inx.INX_ListenToCo
 	wp := workerpool.New("ListenToConfirmedBlocks", workerpool.WithWorkerCount(workerCount)).Start()
 
 	unhook := deps.Protocol.Events.Engine.BlockGadget.BlockConfirmed.Hook(func(block *blocks.Block) {
-		payload, err := getINXBlockMetadata(block.ID())
+		payload, err := inx.WrapBlockMetadata(&api.BlockMetadataResponse{
+			BlockID:    block.ID(),
+			BlockState: api.BlockStateConfirmed,
+		})
 		if err != nil {
 			Component.LogErrorf("get block metadata error: %v", err)
 			cancel()

diff --git a/tools/docker-network/tests/eventapiframework.go b/tools/docker-network/tests/eventapiframework.go
@@ -85,6 +85,8 @@ func (e *EventAPIDockerTestFramework) AssertBlockMetadataStateAcceptedBlocks(ctx
 		for {
 			select {
 			case blk := <-acceptedChan:
+				require.Equal(e.Testing, api.BlockStateAccepted, blk.BlockState, "Block %s is pending in BlockMetadataAccepted topic", blk.BlockID.ToHex())
+
 				resp, err := eventClt.Client.BlockMetadataByBlockID(ctx, blk.BlockID)
 				require.NoError(e.Testing, err)
 				// accepted, confirmed are accepted
@@ -110,6 +112,8 @@ func (e *EventAPIDockerTestFramework) AssertBlockMetadataStateConfirmedBlocks(ct
 		for {
 			select {
 			case blk := <-acceptedChan:
+				require.Equal(e.Testing, api.BlockStateConfirmed, blk.BlockState, "Block %s is pending in BlockMetadataConfirmed topic", blk.BlockID.ToHex())
+
 				resp, err := eventClt.Client.BlockMetadataByBlockID(ctx, blk.BlockID)
 				require.NoError(e.Testing, err)
 				require.NotEqualf(e.Testing, api.BlockStatePending, resp.BlockState, "Block %s is pending in BlockMetadataConfirmed endpoint", blk.BlockID.ToHex())