diff --git a/common/converters.go b/common/converters.go index 036cce7d070..83ccbc084e1 100644 --- a/common/converters.go +++ b/common/converters.go @@ -23,7 +23,7 @@ func ProcessDestinationShardAsObserver(destinationShardIdAsObserver string) (uin val, err := strconv.ParseUint(destShard, 10, 32) if err != nil { - return 0, fmt.Errorf("error parsing DestinationShardAsObserver option: " + err.Error()) + return 0, fmt.Errorf("error parsing DestinationShardAsObserver option: %s", err.Error()) } return uint32(val), err diff --git a/consensus/spos/bls/v2/export_test.go b/consensus/spos/bls/v2/export_test.go index 84ab13e2016..8dbfc1f151e 100644 --- a/consensus/spos/bls/v2/export_test.go +++ b/consensus/spos/bls/v2/export_test.go @@ -263,7 +263,7 @@ func (sr *subroundEndRound) DoEndRoundJobByNode() bool { // CreateAndBroadcastProof calls the unexported createAndBroadcastHeaderFinalInfo function func (sr *subroundEndRound) CreateAndBroadcastProof(signature []byte, bitmap []byte) { - sr.createAndBroadcastProof(signature, bitmap) + _, _ = sr.createAndBroadcastProof(signature, bitmap) } // ReceivedProof calls the unexported receivedProof function diff --git a/dataRetriever/dataPool/proofsCache/proofsPool_test.go b/dataRetriever/dataPool/proofsCache/proofsPool_test.go index cbdf6fefed8..14b25f63541 100644 --- a/dataRetriever/dataPool/proofsCache/proofsPool_test.go +++ b/dataRetriever/dataPool/proofsCache/proofsPool_test.go @@ -82,6 +82,7 @@ func TestProofsPool_ShouldWork(t *testing.T) { proof, err = pp.GetProof(shardID, []byte("hash3")) require.Nil(t, err) + require.Equal(t, proof3, proof) proof, err = pp.GetProof(shardID, []byte("hash4")) require.Nil(t, err) diff --git a/go.mod b/go.mod index cd0ee839650..50b426cbbd0 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/klauspost/cpuid/v2 v2.2.5 github.com/mitchellh/mapstructure v1.5.0 github.com/multiversx/mx-chain-communication-go v1.1.1 - github.com/multiversx/mx-chain-core-go v1.2.24 + github.com/multiversx/mx-chain-core-go v1.2.25-0.20250128130418-5550d48d5e66 github.com/multiversx/mx-chain-crypto-go v1.2.12 github.com/multiversx/mx-chain-es-indexer-go v1.7.14 github.com/multiversx/mx-chain-logger-go v1.0.15 @@ -33,6 +33,7 @@ require ( github.com/stretchr/testify v1.8.4 github.com/urfave/cli v1.22.10 golang.org/x/crypto v0.10.0 + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 gopkg.in/go-playground/validator.v8 v8.18.2 ) @@ -173,7 +174,6 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.11.0 // indirect golang.org/x/sync v0.2.0 // indirect diff --git a/go.sum b/go.sum index ea2dab5a446..9094014f9ed 100644 --- a/go.sum +++ b/go.sum @@ -387,8 +387,8 @@ github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUY github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o= github.com/multiversx/mx-chain-communication-go v1.1.1 h1:y4DoQeQOJTaSUsRzczQFazf8JYQmInddypApqA3AkwM= github.com/multiversx/mx-chain-communication-go v1.1.1/go.mod h1:WK6bP4pGEHGDDna/AYRIMtl6G9OA0NByI1Lw8PmOnRM= -github.com/multiversx/mx-chain-core-go v1.2.24 h1:O0X7N9GfNVUCE9fukXA+dvfCRRjViYn88zOaE7feUog= -github.com/multiversx/mx-chain-core-go v1.2.24/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250128130418-5550d48d5e66 h1:V44pZBVEu3rqTM8CFZljCyYu36yOV4S+4AkRi19FxWE= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250128130418-5550d48d5e66/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= github.com/multiversx/mx-chain-es-indexer-go v1.7.14 h1:V4fuubEUYskWCLQIkbuoB0WHoKyldLQRq/fllIzW1CU= diff --git a/integrationTests/multiShard/block/executingRewardMiniblocks/executingRewardMiniblocks_test.go b/integrationTests/multiShard/block/executingRewardMiniblocks/executingRewardMiniblocks_test.go index 787efdcab90..03445782c61 100644 --- a/integrationTests/multiShard/block/executingRewardMiniblocks/executingRewardMiniblocks_test.go +++ b/integrationTests/multiShard/block/executingRewardMiniblocks/executingRewardMiniblocks_test.go @@ -279,9 +279,6 @@ func updateNumberTransactionsProposed( transactionsForLeader[addressProposer] += nbTransactions } -func updateRewardsForMetachain(_ map[string]uint32, _ *integrationTests.TestProcessorNode) { -} - func verifyRewardsForMetachain( t *testing.T, mapRewardsForMeta map[string]uint32, diff --git a/integrationTests/multiShard/relayedTx/edgecases/edgecases_test.go b/integrationTests/multiShard/relayedTx/edgecases/edgecases_test.go index ffdbc11d04e..51660323333 100644 --- a/integrationTests/multiShard/relayedTx/edgecases/edgecases_test.go +++ b/integrationTests/multiShard/relayedTx/edgecases/edgecases_test.go @@ -113,7 +113,7 @@ func TestRelayedTransactionInMultiShardEnvironmentWithNormalTxButWithTooMuchGas( roundToPropagateMultiShard := int64(20) for i := int64(0); i <= roundToPropagateMultiShard; i++ { - round, nonce = integrationTests.ProposeAndSyncOneBlock(t, nodes, idxProposers, round, nonce) + round, nonce = integrationTests.ProposeAndSyncOneBlock(t, nodes, leaders, round, nonce) integrationTests.AddSelfNotarizedHeaderByMetachain(nodes) } diff --git a/integrationTests/multiShard/smartContract/scCallingSC_test.go b/integrationTests/multiShard/smartContract/scCallingSC_test.go index 74307489b9c..9f46f6e8f03 100644 --- a/integrationTests/multiShard/smartContract/scCallingSC_test.go +++ b/integrationTests/multiShard/smartContract/scCallingSC_test.go @@ -960,16 +960,6 @@ func TestSCNonPayableIntraShardErrorShouldProcessBlock(t *testing.T) { } } -func getNodeIndex(nodeList []*integrationTests.TestProcessorNode, node *integrationTests.TestProcessorNode) (int, error) { - for i := range nodeList { - if node == nodeList[i] { - return i, nil - } - } - - return 0, errors.New("no such node in list") -} - func putDeploySCToDataPool( fileName string, pubkey []byte, diff --git a/integrationTests/testProcessorNode.go b/integrationTests/testProcessorNode.go index af80de2b370..136f701bcab 100644 --- a/integrationTests/testProcessorNode.go +++ b/integrationTests/testProcessorNode.go @@ -136,9 +136,6 @@ import ( "github.com/multiversx/mx-chain-go/vm" vmProcess "github.com/multiversx/mx-chain-go/vm/process" "github.com/multiversx/mx-chain-go/vm/systemSmartContracts/defaults" - vmcommon "github.com/multiversx/mx-chain-vm-common-go" - "github.com/multiversx/mx-chain-vm-common-go/parsers" - wasmConfig "github.com/multiversx/mx-chain-vm-go/config" ) var zero = big.NewInt(0) diff --git a/integrationTests/vm/wasm/wasmvm/testRunner.go b/integrationTests/vm/wasm/wasmvm/testRunner.go index e6756b1a4c2..f5384189d16 100644 --- a/integrationTests/vm/wasm/wasmvm/testRunner.go +++ b/integrationTests/vm/wasm/wasmvm/testRunner.go @@ -3,6 +3,7 @@ package wasmvm import ( "crypto/rand" "encoding/hex" + "errors" "fmt" "math/big" "time" @@ -171,7 +172,7 @@ func DeployAndExecuteERC20WithBigInt( return nil, err } if returnCode != vmcommon.Ok { - return nil, fmt.Errorf(returnCode.String()) + return nil, errors.New(returnCode.String()) } ownerNonce++ @@ -263,7 +264,7 @@ func SetupERC20Test( return err } if returnCode != vmcommon.Ok { - return fmt.Errorf(returnCode.String()) + return errors.New(returnCode.String()) } testContext.ContractOwner.Nonce++ diff --git a/process/block/displayBlock.go b/process/block/displayBlock.go index 3b1ab7410cc..f61ca16b705 100644 --- a/process/block/displayBlock.go +++ b/process/block/displayBlock.go @@ -268,7 +268,7 @@ func (txc *transactionCounter) displayTxBlockBody( miniBlock.SenderShardID, miniBlock.ReceiverShardID) - if miniBlock.TxHashes == nil || len(miniBlock.TxHashes) == 0 { + if len(miniBlock.TxHashes) == 0 { lines = append(lines, display.NewLineData(false, []string{ part, "", ""})) } diff --git a/process/block/displayMetaBlock.go b/process/block/displayMetaBlock.go index 2018b819925..c23e9924d7e 100644 --- a/process/block/displayMetaBlock.go +++ b/process/block/displayMetaBlock.go @@ -145,7 +145,7 @@ func (hc *headersCounter) displayShardInfo(lines []*display.LineData, header *bl "Header hash", logger.DisplayByteSlice(shardData.HeaderHash)})) - if shardData.ShardMiniBlockHeaders == nil || len(shardData.ShardMiniBlockHeaders) == 0 { + if len(shardData.ShardMiniBlockHeaders) == 0 { lines = append(lines, display.NewLineData(false, []string{ "", "ShardMiniBlockHeaders", ""})) } @@ -197,7 +197,7 @@ func (hc *headersCounter) displayTxBlockBody( miniBlock.SenderShardID, miniBlock.ReceiverShardID) - if miniBlock.TxHashes == nil || len(miniBlock.TxHashes) == 0 { + if len(miniBlock.TxHashes) == 0 { lines = append(lines, display.NewLineData(false, []string{ part, "", ""})) } diff --git a/process/factory/interceptorscontainer/metaInterceptorsContainerFactory_test.go b/process/factory/interceptorscontainer/metaInterceptorsContainerFactory_test.go index ec699e5803b..06f589c07df 100644 --- a/process/factory/interceptorscontainer/metaInterceptorsContainerFactory_test.go +++ b/process/factory/interceptorscontainer/metaInterceptorsContainerFactory_test.go @@ -725,7 +725,7 @@ func getArgumentsMeta( WhiteListHandler: &testscommon.WhiteListHandlerStub{}, WhiteListerVerifiedTxs: &testscommon.WhiteListHandlerStub{}, AntifloodHandler: &mock.P2PAntifloodHandlerStub{}, - ArgumentsParser: &mock.ArgumentParserMock{}, + ArgumentsParser: &testscommon.ArgumentParserMock{}, PreferredPeersHolder: &p2pmocks.PeersHolderStub{}, RequestHandler: &testscommon.RequestHandlerStub{}, PeerSignatureHandler: &mock.PeerSignatureHandlerStub{}, diff --git a/process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go b/process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go index d05099299d5..447388221b7 100644 --- a/process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go +++ b/process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go @@ -753,7 +753,7 @@ func getArgumentsShard( AntifloodHandler: &mock.P2PAntifloodHandlerStub{}, WhiteListHandler: &testscommon.WhiteListHandlerStub{}, WhiteListerVerifiedTxs: &testscommon.WhiteListHandlerStub{}, - ArgumentsParser: &mock.ArgumentParserMock{}, + ArgumentsParser: &testscommon.ArgumentParserMock{}, PreferredPeersHolder: &p2pmocks.PeersHolderStub{}, RequestHandler: &testscommon.RequestHandlerStub{}, PeerSignatureHandler: &mock.PeerSignatureHandlerStub{}, diff --git a/process/smartContract/processorV2/testScProcessor.go b/process/smartContract/processorV2/testScProcessor.go index 0e8e643605f..52a63c6c308 100644 --- a/process/smartContract/processorV2/testScProcessor.go +++ b/process/smartContract/processorV2/testScProcessor.go @@ -2,6 +2,7 @@ package processorV2 import ( "encoding/hex" + "errors" "fmt" "strings" @@ -79,7 +80,7 @@ func (tsp *TestScProcessor) GetCompositeTestError() error { func wrapErrorIfNotContains(originalError error, msg string) error { if originalError == nil { - return fmt.Errorf(msg) + return errors.New(msg) } alreadyContainsMessage := strings.Contains(originalError.Error(), msg) diff --git a/process/smartContract/testScProcessor.go b/process/smartContract/testScProcessor.go index a13419ab621..d602619c61e 100644 --- a/process/smartContract/testScProcessor.go +++ b/process/smartContract/testScProcessor.go @@ -2,6 +2,7 @@ package smartContract import ( "encoding/hex" + "errors" "fmt" "strings" @@ -83,7 +84,7 @@ func (tsp *TestScProcessor) GetCompositeTestError() error { func wrapErrorIfNotContains(originalError error, msg string) error { if originalError == nil { - return fmt.Errorf(msg) + return errors.New(msg) } alreadyContainsMessage := strings.Contains(originalError.Error(), msg) diff --git a/process/transaction/interceptedTransaction_test.go b/process/transaction/interceptedTransaction_test.go index ee0234fcffd..a0de364ddff 100644 --- a/process/transaction/interceptedTransaction_test.go +++ b/process/transaction/interceptedTransaction_test.go @@ -114,7 +114,7 @@ func createInterceptedTxWithTxFeeHandlerAndVersionChecker(tx *dataTransaction.Tr shardCoordinator, txFeeHandler, &testscommon.WhiteListHandlerStub{}, - &mock.ArgumentParserMock{}, + &testscommon.ArgumentParserMock{}, []byte("T"), false, &hashingMocks.HasherMock{}, @@ -232,7 +232,7 @@ func TestNewInterceptedTransaction_NilBufferShouldErr(t *testing.T) { mock.NewOneShardCoordinatorMock(), &economicsmocks.EconomicsHandlerStub{}, &testscommon.WhiteListHandlerStub{}, - &mock.ArgumentParserMock{}, + &testscommon.ArgumentParserMock{}, []byte("chainID"), false, &hashingMocks.HasherMock{}, diff --git a/process/transactionEvaluator/simulationAccountsDB_test.go b/process/transactionEvaluator/simulationAccountsDB_test.go index 13655ba315f..16c9e7effdd 100644 --- a/process/transactionEvaluator/simulationAccountsDB_test.go +++ b/process/transactionEvaluator/simulationAccountsDB_test.go @@ -37,36 +37,36 @@ func TestReadOnlyAccountsDB_WriteOperationsShouldNotCalled(t *testing.T) { failErrMsg := "this function should have not be called" accDb := &stateMock.AccountsStub{ SaveAccountCalled: func(account vmcommon.AccountHandler) error { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil }, RemoveAccountCalled: func(_ []byte) error { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil }, CommitCalled: func() ([]byte, error) { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil, nil }, RevertToSnapshotCalled: func(_ int) error { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil }, RecreateTrieCalled: func(_ common.RootHashHolder) error { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil }, PruneTrieCalled: func(_ []byte, _ state.TriePruningIdentifier, _ state.PruningHandler) { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) }, CancelPruneCalled: func(_ []byte, _ state.TriePruningIdentifier) { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) }, SnapshotStateCalled: func(_ []byte, _ uint32) { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) }, RecreateAllTriesCalled: func(_ []byte) (map[string]common.Trie, error) { - t.Errorf(failErrMsg) + t.Errorf("%s", failErrMsg) return nil, nil }, }