fix after merge

dataRetriever/provider/miniBlocks_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/multiversx/mx-chain-go/dataRetriever/mock"
 	"github.com/multiversx/mx-chain-go/dataRetriever/provider"
 	"github.com/multiversx/mx-chain-go/testscommon"
+	"github.com/multiversx/mx-chain-go/testscommon/marshallerMock"
 	storageStubs "github.com/multiversx/mx-chain-go/testscommon/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -247,7 +248,7 @@ func TestMiniBlockProvider_GetMiniBlocksFromStorerShouldBeFoundInStorage(t *test
 
 	cnt := 0
 	arg := createMockMiniblockProviderArgs(nil, existingHashes)
-	arg.Marshalizer = &testscommon.MarshalizerStub{
+	arg.Marshalizer = &marshallerMock.MarshalizerStub{
 		UnmarshalCalled: func(obj interface{}, buff []byte) error {
 			cnt++
 			if cnt == 1 {

go.mod

@@ -14,15 +14,15 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/multiversx/mx-chain-communication-go v1.0.2
-	github.com/multiversx/mx-chain-core-go v1.2.5
+	github.com/multiversx/mx-chain-core-go v1.2.6-0.20230524125511-eca60036b4cc
 	github.com/multiversx/mx-chain-crypto-go v1.2.6
 	github.com/multiversx/mx-chain-es-indexer-go v1.4.4
 	github.com/multiversx/mx-chain-logger-go v1.0.11
 	github.com/multiversx/mx-chain-storage-go v1.0.10
-	github.com/multiversx/mx-chain-vm-common-go v1.4.5
-	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55
-	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.56
-	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.82
+	github.com/multiversx/mx-chain-vm-common-go v1.4.6-0.20230529071152-9f8c64c86758
+	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.56-0.20230529071852-e145dd9e881d
+	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.57-0.20230529071950-dc243366e569
+	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.83-0.20230529071922-9ceebcdad5e1
 	github.com/pelletier/go-toml v1.9.3
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v3.21.11+incompatible

go.sum

@@ -622,8 +622,9 @@ github.com/multiversx/mx-chain-core-go v1.1.30/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZ
 github.com/multiversx/mx-chain-core-go v1.2.1-0.20230510143029-ab37792342df/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
 github.com/multiversx/mx-chain-core-go v1.2.1/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-core-go v1.2.4/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
-github.com/multiversx/mx-chain-core-go v1.2.5 h1:uIZSqRygJAxv+pGuZnoSMwS4t10C/paasuwps5nxrIQ=
 github.com/multiversx/mx-chain-core-go v1.2.5/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
+github.com/multiversx/mx-chain-core-go v1.2.6-0.20230524125511-eca60036b4cc h1:MvlXKFkfFAhcPhBf7jvMI/TgvZRCTBKIuJBnlSuqhek=
+github.com/multiversx/mx-chain-core-go v1.2.6-0.20230524125511-eca60036b4cc/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=
 github.com/multiversx/mx-chain-crypto-go v1.2.6 h1:yxsjAQGh62los+iYmORMfh3w9qen0xbYlmwU0juNSeg=
 github.com/multiversx/mx-chain-crypto-go v1.2.6/go.mod h1:rOj0Rr19HTOYt9YTeym7RKxlHt91NXln3LVKjHKVmA0=
 github.com/multiversx/mx-chain-es-indexer-go v1.4.4 h1:3k8pB1AEILlNXL2ggSnP43uqVBQQg3hbx7351IcGbh0=
@@ -634,15 +635,14 @@ github.com/multiversx/mx-chain-storage-go v1.0.8/go.mod h1:lEkFYFe6taKYxqO1einNg
 github.com/multiversx/mx-chain-storage-go v1.0.10 h1:5rzPMME+CEJyoGGJ1tAb6ISnPmr68VFvGoKo0hF0WtU=
 github.com/multiversx/mx-chain-storage-go v1.0.10/go.mod h1:VP9fwyFBmbmDzahUuu0IeGX/dKG3iBWjN6FSQ6YtVaI=
 github.com/multiversx/mx-chain-vm-common-go v1.4.1/go.mod h1:K6yCdro8VohzYI6GwjGzTO+fJiPgO5coo2sgQb+zA24=
-github.com/multiversx/mx-chain-vm-common-go v1.4.4/go.mod h1:+AjDwO/RJwQ75dzHJ/gBxmi5uTdICdhAo8bGNHTf7Yk=
-github.com/multiversx/mx-chain-vm-common-go v1.4.5 h1:/pIMGSGqNJXbfAKOqigU2yapuBlosMCJiu6r+r+XcHE=
-github.com/multiversx/mx-chain-vm-common-go v1.4.5/go.mod h1:+AjDwO/RJwQ75dzHJ/gBxmi5uTdICdhAo8bGNHTf7Yk=
-github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55 h1:jvBLu7JoitavahMDCkfOGYWjgXGBOe+3JJ0hNxj9AZM=
-github.com/multiversx/mx-chain-vm-v1_2-go v1.2.55/go.mod h1:jCNgHGyj0JoLAsmijOSVK0G+yphccp9gIKsp/mRguF4=
-github.com/multiversx/mx-chain-vm-v1_3-go v1.3.56 h1:VXveqaT/wdipfhIdUHXxFderY3+KxtFEbrDkF+zirr8=
-github.com/multiversx/mx-chain-vm-v1_3-go v1.3.56/go.mod h1:guKkvnEDwGPaysZOVa+SaHEyiFDRJkFSVu0VE7jbk4k=
-github.com/multiversx/mx-chain-vm-v1_4-go v1.4.82 h1:f0jL0jMPayN+/J/ZoK9sDRLggqvUp+/DJmu0dVTQNq8=
-github.com/multiversx/mx-chain-vm-v1_4-go v1.4.82/go.mod h1:tKdkDQXDPFE5vAYOAJOq2iiTibi9KeiasNWsmA4nEmk=
+github.com/multiversx/mx-chain-vm-common-go v1.4.6-0.20230529071152-9f8c64c86758 h1:W7rXYs2mIpEobC79pehOBUJalS+X/ebFJuqypg5s4EU=
+github.com/multiversx/mx-chain-vm-common-go v1.4.6-0.20230529071152-9f8c64c86758/go.mod h1:CcWzmM7Id+W/hHqAAz1RvWnnkn9EV3MIVI4HwYcQM+I=
+github.com/multiversx/mx-chain-vm-v1_2-go v1.2.56-0.20230529071852-e145dd9e881d h1:peCti54oa9kSQJ8nQS3LzsMr8QebmHNFZgBDy3vCOMA=
+github.com/multiversx/mx-chain-vm-v1_2-go v1.2.56-0.20230529071852-e145dd9e881d/go.mod h1:T9h3cGNRK17ckgaq1wOqO3DUZCPJ2Eptcshx1nChHAk=
+github.com/multiversx/mx-chain-vm-v1_3-go v1.3.57-0.20230529071950-dc243366e569 h1:5QESvVt6sqXt1jorWipqRpwvSJNKppCCNJY1tNeaVZE=
+github.com/multiversx/mx-chain-vm-v1_3-go v1.3.57-0.20230529071950-dc243366e569/go.mod h1:Bof0p1AKSlWVyPfgAwCOBoUfcHjeORIxHDz0tvr+VAM=
+github.com/multiversx/mx-chain-vm-v1_4-go v1.4.83-0.20230529071922-9ceebcdad5e1 h1:BuWtTQiRM6htK6Xg6w/slYoOJTgoWYzjlVmCVjUx51Y=
+github.com/multiversx/mx-chain-vm-v1_4-go v1.4.83-0.20230529071922-9ceebcdad5e1/go.mod h1:7ARF9QSLmSj7o8WFGsdtO0G3Fa+wkIolO3viQQmwp8I=
 github.com/multiversx/mx-components-big-int v0.1.1 h1:695mYPKYOrmGEGgRH4/pZruDoe3CPP1LHrBxKfvj5l4=
 github.com/multiversx/mx-components-big-int v0.1.1/go.mod h1:0QrcFdfeLgJ/am10HGBeH0G0DNF+0Qx1E4DS/iozQls=
 github.com/multiversx/protobuf v1.3.2 h1:RaNkxvGTGbA0lMcnHAN24qE1G1i+Xs5yHA6MDvQ4mSM=