From 8a36d9d3d06a5cd55f4614d33a4b87b7b154971c Mon Sep 17 00:00:00 2001
From: Tuan Tran <tuantran@notional.ventures>
Date: Tue, 30 Apr 2024 18:14:02 +0700
Subject: [PATCH] refactor: replace error-handling code for potential wrapped
 errors (#20214)

---
 crypto/keys/secp256k1/internal/secp256k1/secp256_test.go | 3 ++-
 x/group/internal/orm/table_test.go                       | 7 ++++---
 x/upgrade/plan/downloader.go                             | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/crypto/keys/secp256k1/internal/secp256k1/secp256_test.go b/crypto/keys/secp256k1/internal/secp256k1/secp256_test.go
index f899993ce4..76a8b2be09 100644
--- a/crypto/keys/secp256k1/internal/secp256k1/secp256_test.go
+++ b/crypto/keys/secp256k1/internal/secp256k1/secp256_test.go
@@ -13,6 +13,7 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"encoding/hex"
+	"errors"
 	"io"
 	"testing"
 )
@@ -93,7 +94,7 @@ func TestInvalidRecoveryID(t *testing.T) {
 	sig, _ := Sign(msg, seckey)
 	sig[64] = 99
 	_, err := RecoverPubkey(msg, sig)
-	if err != ErrInvalidRecoveryID {
+	if !errors.Is(err, ErrInvalidRecoveryID) {
 		t.Fatalf("got %q, want %q", err, ErrInvalidRecoveryID)
 	}
 }
diff --git a/x/group/internal/orm/table_test.go b/x/group/internal/orm/table_test.go
index 5741185a28..d8fd28965d 100644
--- a/x/group/internal/orm/table_test.go
+++ b/x/group/internal/orm/table_test.go
@@ -1,6 +1,7 @@
 package orm
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
@@ -10,7 +11,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	storetypes "cosmossdk.io/store/types"
-	"cosmossdk.io/x/group/errors"
+	grouperrors "cosmossdk.io/x/group/errors"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/address"
@@ -70,7 +71,7 @@ func TestCreate(t *testing.T) {
 				Id:   1,
 				Name: "some name",
 			},
-			expErr: errors.ErrORMEmptyKey,
+			expErr: grouperrors.ErrORMEmptyKey,
 		},
 		"happy path": {
 			rowID: EncodeSequence(1),
@@ -231,7 +232,7 @@ func TestDelete(t *testing.T) {
 
 			// then
 			var loaded testdata.TableModel
-			if spec.expErr == sdkerrors.ErrNotFound {
+			if errors.Is(spec.expErr, sdkerrors.ErrNotFound) {
 				require.NoError(t, myTable.GetOne(store, EncodeSequence(1), &loaded))
 				assert.Equal(t, initValue, loaded)
 			} else {
diff --git a/x/upgrade/plan/downloader.go b/x/upgrade/plan/downloader.go
index 7bcb153bd5..199cc1b528 100644
--- a/x/upgrade/plan/downloader.go
+++ b/x/upgrade/plan/downloader.go
@@ -30,7 +30,8 @@ func DownloadUpgrade(dstRoot, url, daemonName string) error {
 	// First try to download it as a single file. If there's no error, it's okay and we're done.
 	if err := getFile(url, target); err != nil {
 		// If it was a checksum error, no need to try as directory.
-		if _, ok := err.(*getter.ChecksumError); ok {
+		var checksumError *getter.ChecksumError
+		if errors.As(err, &checksumError) {
 			return err
 		}
 		// File download didn't work, try it as an archive.