small refactor and fix failing tests

Author: BeniaminDrasovean

data/block/blockV3_test.go

@@ -171,10 +171,16 @@ func TestHeaderV3_GetOrderedCrossMiniblocksWithDst(t *testing.T) {
 		hash1 := []byte("hash1")
 		hash2 := []byte("hash2")
 		hv3 := &block.HeaderV3{
-			Round: 42,
-			MiniBlockHeaders: []block.MiniBlockHeader{
-				{ReceiverShardID: 1, SenderShardID: 0, Hash: hash1},
-				{ReceiverShardID: 2, SenderShardID: 1, Hash: hash2},
+			ExecutionResults: []*block.ExecutionResult{
+				{
+					BaseExecutionResult: &block.BaseExecutionResult{
+						HeaderRound: 42,
+					},
+					MiniBlockHeaders: []block.MiniBlockHeader{
+						{ReceiverShardID: 1, SenderShardID: 0, Hash: hash1},
+						{ReceiverShardID: 2, SenderShardID: 1, Hash: hash2},
+					},
+				},
 			},
 		}
 		expected := []*data.MiniBlockInfo{

data/block/metaBlockV3.go

@@ -5,6 +5,7 @@ package block
 import (
 	"fmt"
 	"math/big"
+	"sort"
 
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
@@ -320,35 +321,33 @@ func (m *MetaBlockV3) GetOrderedCrossMiniblocksWithDst(destID uint32) []*data.Mi
 	}
 
 	miniBlockHeaders := m.getMiniBlocksWithDstFromMetaExecutionResults(destID)
-	for _, mb := range miniBlockHeaders {
-		isDestinationShard := (mb.ReceiverShardID == destID ||
-			mb.ReceiverShardID == core.AllShardId) &&
-			mb.SenderShardID != destID
-		if isDestinationShard {
-			miniBlocks = append(miniBlocks, &data.MiniBlockInfo{
-				Hash:          mb.Hash,
-				SenderShardID: mb.SenderShardID,
-				Round:         m.Round,
-			})
-		}
-	}
+	miniBlocks = append(miniBlocks, miniBlockHeaders...)
+
+	sort.Slice(miniBlocks, func(i, j int) bool {
+		return miniBlocks[i].Round < miniBlocks[j].Round
+	})
 
 	return miniBlocks
 }
 
-func (m *MetaBlockV3) getMiniBlocksWithDstFromMetaExecutionResults(destID uint32) []MiniBlockHeader {
-	miniBlocks := make([]MiniBlockHeader, 0)
+func (m *MetaBlockV3) getMiniBlocksWithDstFromMetaExecutionResults(destID uint32) []*data.MiniBlockInfo {
+	miniBlocks := make([]*data.MiniBlockInfo, 0)
 
 	for _, execResults := range m.ExecutionResults {
 		for _, mb := range execResults.MiniBlockHeaders {
 			isDestinationShard := (mb.ReceiverShardID == destID ||
 				mb.ReceiverShardID == core.AllShardId) &&
 				mb.SenderShardID != destID
 			if isDestinationShard {
-				miniBlocks = append(miniBlocks, mb)
+				miniBlocks = append(miniBlocks, &data.MiniBlockInfo{
+					Hash:          mb.Hash,
+					SenderShardID: mb.SenderShardID,
+					Round:         execResults.GetHeaderRound(),
+				})
 			}
 		}
 	}
+
 	return miniBlocks
 }
 

data/block/metaBlockV3_test.go

@@ -407,23 +407,30 @@ func TestMetaBlockV3_GetOrderedCrossMiniblocksWithDst(t *testing.T) {
 
 	metaHdr.ShardInfo = append(metaHdr.ShardInfo, shData1, shData2, shData3, shData4, shData5)
 
-	metaHdr.MiniBlockHeaders = append(metaHdr.MiniBlockHeaders, block.MiniBlockHeader{
+	mb1 := block.MiniBlockHeader{
 		Hash:            []byte("hash6"),
 		SenderShardID:   core.MetachainShardId,
 		ReceiverShardID: 1,
-	})
+	}
 
-	metaHdr.MiniBlockHeaders = append(metaHdr.MiniBlockHeaders, block.MiniBlockHeader{
+	mb2 := block.MiniBlockHeader{
 		Hash:            []byte("hash7"),
 		SenderShardID:   core.MetachainShardId,
 		ReceiverShardID: core.AllShardId,
-	})
+	}
 
-	metaHdr.MiniBlockHeaders = append(metaHdr.MiniBlockHeaders, block.MiniBlockHeader{
+	mb3 := block.MiniBlockHeader{
 		Hash:            []byte("hash8"),
 		SenderShardID:   core.MetachainShardId,
 		ReceiverShardID: 2,
-	})
+	}
+	metaHdr.ExecutionResults = make([]*block.MetaExecutionResult, 1)
+	metaHdr.ExecutionResults[0] = &block.MetaExecutionResult{
+		MiniBlockHeaders: []block.MiniBlockHeader{mb1, mb2, mb3},
+		ExecutionResult: &block.BaseMetaExecutionResult{
+			BaseExecutionResult: &block.BaseExecutionResult{HeaderRound: 6},
+		},
+	}
 
 	miniBlocksInfo := metaHdr.GetOrderedCrossMiniblocksWithDst(1)
 	require.Equal(t, 6, len(miniBlocksInfo))