Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: go build ./...

- name: Install gotestsum
run: go install gotest.tools/gotestsum@v1.12.0
run: go install gotest.tools/gotestsum@v1.13.0

- name: Run Go tests
run: gotestsum
Expand Down
11 changes: 5 additions & 6 deletions pkg/cmd/flag/flag_big_int_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package flag

import (
"fmt"
"errors"
"math/big"
"reflect"
"testing"

pflag "github.com/spf13/pflag"
Expand All @@ -25,9 +24,9 @@ func TestBigIntVarFlag_Set(t *testing.T) {
},
"invalid value": {
value: "100k",
expectedError: fmt.Errorf(
"invalid argument \"100k\" for \"--%s\" flag: failed to parse as big.Int: 100k",
bigIntFlagName,
expectedError: errors.New(
"invalid argument \"100k\" for \"--" + bigIntFlagName +
"\" flag: failed to parse as big.Int: 100k",
),
expectedValue: defaultValue,
},
Expand All @@ -43,7 +42,7 @@ func TestBigIntVarFlag_Set(t *testing.T) {

err := flags.Set(bigIntFlagName, test.value)

if !reflect.DeepEqual(test.expectedError, err) {
if errorMessage(err) != errorMessage(test.expectedError) {
t.Errorf(
"unexpected error\nexpected: %v\nactual: %v\n",
test.expectedError,
Expand Down
12 changes: 12 additions & 0 deletions pkg/cmd/flag/flag_helpers_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package flag

// errorMessage returns err.Error() or "" if err is nil. Used to compare error
// equality by message string rather than by concrete type, since pflag wraps
// underlying errors with fmt.Errorf("...: %w", inner) — the rendered message
// stays stable across pflag versions but the concrete type does not.
func errorMessage(err error) string {
if err == nil {
return ""
}
return err.Error()
}
17 changes: 8 additions & 9 deletions pkg/cmd/flag/flag_wei_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package flag

import (
"fmt"
"errors"
"math/big"
"reflect"
"testing"

"github.com/keep-network/keep-common/pkg/chain/ethereum"
Expand Down Expand Up @@ -37,16 +36,16 @@ func TestWeiVarFlag_Set(t *testing.T) {
},
"value with invalid comma delimiter": {
value: "3,5 ether",
expectedError: fmt.Errorf(
"invalid argument \"3,5 ether\" for \"--%s\" flag: failed to parse value: [3,5 ether]",
flagName,
expectedError: errors.New(
"invalid argument \"3,5 ether\" for \"--" + flagName +
"\" flag: failed to parse value: [3,5 ether]",
),
},
"value with invalid unit": {
value: "10 bei",
expectedError: fmt.Errorf(
"invalid argument \"10 bei\" for \"--%s\" flag: invalid unit: bei; please use one of: ether, gwei, wei",
flagName,
expectedError: errors.New(
"invalid argument \"10 bei\" for \"--" + flagName +
"\" flag: invalid unit: bei; please use one of: ether, gwei, wei",
),
},
}
Expand All @@ -61,7 +60,7 @@ func TestWeiVarFlag_Set(t *testing.T) {

err := flags.Set(flagName, test.value)

if !reflect.DeepEqual(test.expectedError, err) {
if errorMessage(err) != errorMessage(test.expectedError) {
t.Errorf(
"unexpected error\nexpected: %v\nactual: %v\n",
test.expectedError,
Expand Down
Loading