Merge branch 'feat/go-v1.20.5-integration' into test-p2p-options

multiversx · Jul 7, 2023 · bc1299f · bc1299f
2 parents 8fb62d6 + 5a06a1f
commit bc1299f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/process/transaction/shardProcess_test.go b/process/transaction/shardProcess_test.go
@@ -3300,8 +3300,8 @@ func TestTxProcessor_AddNonExecutableLog(t *testing.T) {
 		SndAddr: relayer,
 		RcvAddr: sender,
 	}
-	originalTxHash, err := core.CalculateHash(args.Marshalizer, args.Hasher, originalTx)
-	assert.Nil(t, err)
+	originalTxHash, errCalculateHash := core.CalculateHash(args.Marshalizer, args.Hasher, originalTx)
+	assert.Nil(t, errCalculateHash)
 
 	t.Run("not a non-executable error should not record log", func(t *testing.T) {
 		t.Parallel()
@@ -3315,7 +3315,7 @@ func TestTxProcessor_AddNonExecutableLog(t *testing.T) {
 			},
 		}
 		txProc, _ := txproc.NewTxProcessor(argsLocal)
-		err = txProc.AddNonExecutableLog(errors.New("random error"), originalTxHash, originalTx)
+		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) {
@@ -3340,7 +3340,7 @@ func TestTxProcessor_AddNonExecutableLog(t *testing.T) {
 		}
 
 		txProc, _ := txproc.NewTxProcessor(argsLocal)
-		err = txProc.AddNonExecutableLog(process.ErrLowerNonceInTransaction, originalTxHash, originalTx)
+		err := txProc.AddNonExecutableLog(process.ErrLowerNonceInTransaction, originalTxHash, originalTx)
 		assert.Nil(t, err)
 
 		err = txProc.AddNonExecutableLog(process.ErrHigherNonceInTransaction, originalTxHash, originalTx)