From afb667529407ae93cf206753eae6d3190b25eccd Mon Sep 17 00:00:00 2001 From: Sorin Stanculeanu Date: Tue, 27 Jun 2023 12:29:25 +0300 Subject: [PATCH] fix race in tests --- process/transaction/shardProcess_test.go | 44 ++++++++++++++---------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/process/transaction/shardProcess_test.go b/process/transaction/shardProcess_test.go index 98aa46d7727..ecaace3207d 100644 --- a/process/transaction/shardProcess_test.go +++ b/process/transaction/shardProcess_test.go @@ -90,9 +90,9 @@ func createArgsForTxProcessor() txproc.ArgsNewTxProcessor { EnableEpochsHandler: &enableEpochsHandlerMock.EnableEpochsHandlerStub{ IsPenalizedTooMuchGasFlagEnabledField: true, }, - GuardianChecker: &guardianMocks.GuardedAccountHandlerStub{}, - TxVersionChecker: &testscommon.TxVersionCheckerStub{}, - TxLogsProcessor: &mock.TxLogsProcessorStub{}, + GuardianChecker: &guardianMocks.GuardedAccountHandlerStub{}, + TxVersionChecker: &testscommon.TxVersionCheckerStub{}, + TxLogsProcessor: &mock.TxLogsProcessorStub{}, EnableRoundsHandler: &testscommon.EnableRoundsHandlerStub{}, } return args @@ -3258,37 +3258,43 @@ func TestTxProcessor_shouldIncreaseNonce(t *testing.T) { func TestTxProcessor_AddNonExecutableLog(t *testing.T) { t.Parallel() - args := createArgsForTxProcessor() - sender := []byte("sender") - relayer := []byte("relayer") - originalTx := &transaction.Transaction{ - SndAddr: relayer, - RcvAddr: sender, - } - originalTxHash, err := core.CalculateHash(args.Marshalizer, args.Hasher, originalTx) - assert.Nil(t, err) - t.Run("not a non-executable error should not record log", func(t *testing.T) { t.Parallel() - argsLocal := args - argsLocal.TxLogsProcessor = &mock.TxLogsProcessorStub{ + args := createArgsForTxProcessor() + sender := []byte("sender") + relayer := []byte("relayer") + originalTx := &transaction.Transaction{ + SndAddr: relayer, + RcvAddr: sender, + } + originalTxHash, err := core.CalculateHash(args.Marshalizer, args.Hasher, originalTx) + assert.Nil(t, err) + args.TxLogsProcessor = &mock.TxLogsProcessorStub{ SaveLogCalled: func(txHash []byte, tx data.TransactionHandler, vmLogs []*vmcommon.LogEntry) error { assert.Fail(t, "should have not called SaveLog") return nil }, } - txProc, _ := txproc.NewTxProcessor(argsLocal) + txProc, _ := txproc.NewTxProcessor(args) err = txProc.AddNonExecutableLog(errors.New("random error"), originalTxHash, originalTx) assert.Nil(t, err) }) t.Run("is non executable tx error should record log", func(t *testing.T) { t.Parallel() - argsLocal := args + args := createArgsForTxProcessor() + sender := []byte("sender") + relayer := []byte("relayer") + originalTx := &transaction.Transaction{ + SndAddr: relayer, + RcvAddr: sender, + } + originalTxHash, err := core.CalculateHash(args.Marshalizer, args.Hasher, originalTx) + assert.Nil(t, err) numLogsSaved := 0 - argsLocal.TxLogsProcessor = &mock.TxLogsProcessorStub{ + args.TxLogsProcessor = &mock.TxLogsProcessorStub{ SaveLogCalled: func(txHash []byte, tx data.TransactionHandler, vmLogs []*vmcommon.LogEntry) error { assert.Equal(t, originalTxHash, txHash) assert.Equal(t, originalTx, tx) @@ -3304,7 +3310,7 @@ func TestTxProcessor_AddNonExecutableLog(t *testing.T) { }, } - txProc, _ := txproc.NewTxProcessor(argsLocal) + txProc, _ := txproc.NewTxProcessor(args) err = txProc.AddNonExecutableLog(process.ErrLowerNonceInTransaction, originalTxHash, originalTx) assert.Nil(t, err)