fix: wrappedError.Is (#8355) (#8377)

From: #8385 Co-authored-by: Alessio Treglia <[email protected]>
cosmos · Jan 19, 2021 · ca2ff62 · ca2ff62
1 parent f2de540
commit ca2ff62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/types/errors/errors.go b/types/errors/errors.go
@@ -318,12 +318,11 @@ func (e *wrappedError) Cause() error {
 
 // Is reports whether any error in e's chain matches a target.
 func (e *wrappedError) Is(target error) bool {
-	if target == nil {
-		return e == target
+	if e == target {
+		return true
 	}
 
 	w := e.Cause()
-
 	for {
 		if w == target {
 			return true

diff --git a/types/errors/errors_test.go b/types/errors/errors_test.go
@@ -161,17 +161,24 @@ func (s *errorsTestSuite) TestWrapEmpty() {
 }
 
 func (s *errorsTestSuite) TestWrappedIs() {
+	require := s.Require()
 	err := Wrap(ErrTxTooLarge, "context")
-	s.Require().True(stdlib.Is(err, ErrTxTooLarge))
+	require.True(stdlib.Is(err, ErrTxTooLarge))
 
 	err = Wrap(err, "more context")
-	s.Require().True(stdlib.Is(err, ErrTxTooLarge))
+	require.True(stdlib.Is(err, ErrTxTooLarge))
 
 	err = Wrap(err, "even more context")
-	s.Require().True(stdlib.Is(err, ErrTxTooLarge))
+	require.True(stdlib.Is(err, ErrTxTooLarge))
 
 	err = Wrap(ErrInsufficientFee, "...")
-	s.Require().False(stdlib.Is(err, ErrTxTooLarge))
+	require.False(stdlib.Is(err, ErrTxTooLarge))
+
+	errs := stdlib.New("other")
+	require.True(stdlib.Is(errs, errs))
+
+	errw := &wrappedError{"msg", errs}
+	require.True(errw.Is(errw), "should match itself")
 }
 
 func (s *errorsTestSuite) TestWrappedIsMultiple() {