Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix race in tests #5379

Merged
merged 1 commit into from
Jun 27, 2023
Merged

fix race in tests #5379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions process/transaction/shardProcess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)

Expand Down