- wrap error only if missing

- changed github workflows scope
SergeevDmitry · Apr 20, 2022 · 97935e5 · 97935e5
1 parent 606f5f7
commit 97935e5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -6,6 +6,7 @@ on:
       - master
   pull_request:
     branches: [ master, development ]
+    types: [opened, ready_for_review]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -5,6 +5,7 @@ on:
       - master
   pull_request:
     branches: [ master, development ]
+    types: [opened, ready_for_review]
 jobs:
   golangci:
     name: golangci linter

diff --git a/integrationTests/vm/arwen/arwenvm/arwenVM_test.go b/integrationTests/vm/arwen/arwenvm/arwenVM_test.go
@@ -182,7 +182,7 @@ func TestSCMoveBalanceBeforeSCDeploy(t *testing.T) {
 	_, err = testContext.TxProcessor.ProcessTransaction(tx)
 
 	require.Equal(t, process.ErrFailedTransaction, err)
-	require.Equal(t, fmt.Errorf("%s: %s", process.ErrAccountNotPayable.Error(), "sending value to non payable contract"), testContext.GetCompositeTestError())
+	require.Equal(t, process.ErrAccountNotPayable, testContext.GetCompositeTestError())
 	vm.TestAccount(
 		t,
 		testContext.Accounts,

diff --git a/integrationTests/vm/txsFee/multiShard/moveBalance_test.go b/integrationTests/vm/txsFee/multiShard/moveBalance_test.go
@@ -84,7 +84,7 @@ func TestMoveBalanceContractAddressDataFieldNilShouldConsumeGas(t *testing.T) {
 	retCode, err := testContext.TxProcessor.ProcessTransaction(tx)
 	require.Equal(t, vmcommon.UserError, retCode)
 	require.Nil(t, err)
-	require.Equal(t, errors.New("sending value to non payable contract: sending value to non payable contract"), testContext.GetCompositeTestError())
+	require.Equal(t, errors.New("sending value to non payable contract"), testContext.GetCompositeTestError())
 
 	_, err = testContext.Accounts.Commit()
 	require.Nil(t, err)

diff --git a/process/smartContract/testScProcessor.go b/process/smartContract/testScProcessor.go
@@ -30,7 +30,7 @@ func (tsp *TestScProcessor) GetCompositeTestError() error {
 		for _, logs := range allLogs {
 			for _, event := range logs.GetLogEvents() {
 				if string(event.GetIdentifier()) == signalError {
-					returnError = wrapError(returnError, string(event.GetTopics()[1]))
+					returnError = wrapErrorIfNotContains(returnError, string(event.GetTopics()[1]))
 				}
 			}
 		}
@@ -67,10 +67,10 @@ func (tsp *TestScProcessor) GetCompositeTestError() error {
 			if returnCodeAsString == "ok" || returnCodeAsString == "" {
 				return returnError
 			}
-			return wrapError(returnError, returnCodeAsString)
+			return wrapErrorIfNotContains(returnError, returnCodeAsString)
 		}
 
-		return wrapError(returnError, returnCodeHex)
+		return wrapErrorIfNotContains(returnError, returnCodeHex)
 	}
 
 	tsp.txLogsProcessor.Clean()
@@ -79,11 +79,16 @@ func (tsp *TestScProcessor) GetCompositeTestError() error {
 	return returnError
 }
 
-func wrapError(originalError error, msg string) error {
+func wrapErrorIfNotContains(originalError error, msg string) error {
 	if originalError == nil {
 		return fmt.Errorf(msg)
 	}
 
+	alreadyContainsMessage := strings.Contains(originalError.Error(), msg)
+	if alreadyContainsMessage {
+		return originalError
+	}
+
 	return fmt.Errorf("%s: %s", originalError.Error(), msg)
 }