fix integration tests

Author: miiu96

integrationtests/miniblocks_test.go

@@ -4,9 +4,11 @@ package integrationtests
 
 import (
 	"context"
+	"encoding/hex"
 	"testing"
 
 	dataBlock "github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-core-go/data/outport"
 	"github.com/multiversx/mx-chain-core-go/marshal"
 	indexerdata "github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
 	"github.com/stretchr/testify/require"
@@ -31,7 +33,12 @@ func TestIndexMiniBlocksOnSourceAndDestination(t *testing.T) {
 			ReceiverShardID: 2,
 		},
 	}
-	err = esProc.SaveMiniblocks(header, miniBlocks, 1234000)
+
+	body := &dataBlock.Body{MiniBlocks: miniBlocks}
+	pool := &outport.TransactionPool{}
+	ob := createOutportBlockWithHeader(body, header, pool, nil, testNumOfShards)
+	ob.BlockData.HeaderHash, _ = hex.DecodeString("3fede8a9a3c4f2ba6d7e6e01541813606cd61c4d3af2940f8e089827b5d94e50")
+	err = esProc.SaveMiniblocks(ob)
 	require.Nil(t, err)
 	mbHash := "11a1bb4065e16a2e93b2b5ac5957b7b69f1cfba7579b170b24f30dab2d3162e0"
 	ids := []string{mbHash}
@@ -57,7 +64,9 @@ func TestIndexMiniBlocksOnSourceAndDestination(t *testing.T) {
 		},
 	}
 
-	err = esProc.SaveMiniblocks(header, miniBlocks, 1234000)
+	ob = createOutportBlockWithHeader(body, header, pool, nil, testNumOfShards)
+	ob.BlockData.HeaderHash, _ = hex.DecodeString("d7f1e8003a45c7adbd87bbbb269cb4af3d1f4aedd0c214973bfc096dd0f3b65e")
+	err = esProc.SaveMiniblocks(ob)
 	require.Nil(t, err)
 
 	err = esClient.DoMultiGet(context.Background(), ids, indexerdata.MiniblocksIndex, true, genericResponse)
@@ -96,7 +105,12 @@ func TestIndexMiniBlockFirstOnDestinationAndAfterSource(t *testing.T) {
 		},
 	}
 
-	err = esProc.SaveMiniblocks(header, miniBlocks, 54321000)
+	pool := &outport.TransactionPool{}
+	body := &dataBlock.Body{MiniBlocks: miniBlocks}
+	ob := createOutportBlockWithHeader(body, header, pool, nil, testNumOfShards)
+	ob.BlockData.HeaderHash, _ = hex.DecodeString("b36435faaa72390772da84f418348ce0d477c74432579519bf0ffea1dc4c36e9")
+	ob.BlockData.TimestampMs = 54321000
+	err = esProc.SaveMiniblocks(ob)
 	require.Nil(t, err)
 	genericResponse := &GenericResponse{}
 
@@ -116,7 +130,10 @@ func TestIndexMiniBlockFirstOnDestinationAndAfterSource(t *testing.T) {
 			Reserved: mbhrBytes,
 		},
 	}
-	err = esProc.SaveMiniblocks(header, miniBlocks, 54321000)
+
+	ob = createOutportBlockWithHeader(body, header, pool, nil, testNumOfShards)
+	ob.BlockData.HeaderHash, _ = hex.DecodeString("b601381e1f41df2aa3da9f2b8eb169f14c86418229e30fc65f9e6b37b7f0d902")
+	err = esProc.SaveMiniblocks(ob)
 	require.Nil(t, err)
 	err = esClient.DoMultiGet(context.Background(), ids, indexerdata.MiniblocksIndex, true, genericResponse)
 	require.Nil(t, err)

process/elasticproc/elasticProcessor.go

@@ -438,7 +438,7 @@ func (ei *elasticProcessor) SaveMiniblocks(obh *outport.OutportBlockWithHeader)
 		NumberOfShards:   obh.NumberOfShards,
 		HeaderHash:       obh.BlockData.HeaderHash,
 	}
-	miniBlocks := append(obh.BlockData.Body.MiniBlocks, obh.BlockData.Body.MiniBlocks...)
+	miniBlocks := append(obh.BlockData.Body.MiniBlocks, obh.BlockData.IntraShardMiniBlocks...)
 	mbs := ei.miniblocksProc.PrepareDBMiniblocks(headerData, miniBlocks)
 	ei.miniblocksProc.SerializeBulkMiniBlocks(mbs, buffSlice, elasticIndexer.MiniblocksIndex, headerData.ShardID)