Fixed linter errors, migrated deprecated packages

strangelove-ventures · Sep 11, 2023 · 93652eb · 93652eb
1 parent 7a4b821
commit 93652eb
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 29 deletions.
diff --git a/x/igp/keeper/msg_server_test.go b/x/igp/keeper/msg_server_test.go
@@ -1,7 +1,6 @@
 package keeper_test
 
 import (
-	"encoding/hex"
 	"fmt"
 	"math/big"
 	"math/rand"
@@ -667,16 +666,6 @@ func (suite *KeeperTestSuite) SetupIsm() {
 	}
 }
 
-func (suite *KeeperTestSuite) getTestMessageMetadata(index int) (message []byte, metadata []byte) {
-	var err error
-	message, err = hex.DecodeString(messages[index])
-	suite.Require().NoError(err)
-
-	metadata, err = hex.DecodeString(metadatas[index])
-	suite.Require().NoError(err)
-	return
-}
-
 func (suite *KeeperTestSuite) VerifyMessage(message []byte, metadata []byte) (bool, error) {
 	// Verify Merkle Proof & Validator signature (for LegacyMultiSig). TODO: Ask Steve why this isn't the case for other MultiSigs.
 	return ismMap[common.Origin(message)].Verify(metadata, message)

diff --git a/x/igp/keeper/test_data_test.go b/x/igp/keeper/test_data_test.go
diff --git a/x/ism/keeper/genesis.go b/x/ism/keeper/genesis.go
@@ -42,6 +42,9 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) types.GenesisState {
 			panic(err)
 		}
 		ismAny, err := types.PackAbstractIsm(ism)
+		if err != nil {
+			panic(err)
+		}
 		genesisState.DefaultIsm = append(genesisState.DefaultIsm, types.Ism{
 			Origin:      uint32(origin),
 			AbstractIsm: ismAny,

diff --git a/x/ism/types/errors.go b/x/ism/types/errors.go
@@ -1,6 +1,6 @@
 package types
 
-import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+import sdkerrors "cosmossdk.io/errors"
 
 var (
 	ErrInvalid                   = sdkerrors.Register(ModuleName, 1, "invalid")

diff --git a/x/ism/types/message_id_multisig/metadata_test.go b/x/ism/types/message_id_multisig/metadata_test.go
@@ -15,7 +15,6 @@ type MultisigIsmMetadata struct {
 	Index         uint32
 	OriginMailbox []byte
 	Proof         []byte
-	signatures    [][]byte
 }
 
 func TestMetadataSuccess(t *testing.T) {

diff --git a/x/mailbox/bindings/message_plugin.go b/x/mailbox/bindings/message_plugin.go
@@ -3,10 +3,10 @@ package bindings
 import (
 	"encoding/json"
 
+	sdkerrors "cosmossdk.io/errors"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	bindingstypes "github.com/strangelove-ventures/hyperlane-cosmos/x/mailbox/bindings/types"
 	mailboxkeeper "github.com/strangelove-ventures/hyperlane-cosmos/x/mailbox/keeper"

diff --git a/x/mailbox/keeper/genesis.go b/x/mailbox/keeper/genesis.go
@@ -21,7 +21,10 @@ func (k *Keeper) InitGenesis(ctx sdk.Context, gs types.GenesisState) error {
 	}
 	var index uint32
 	for index = 0; index < gs.Tree.Count; index++ {
-		k.Tree.Insert(tempTree[index])
+		err := k.Tree.Insert(tempTree[index])
+		if err != nil {
+			panic("unreachable")
+		}
 	}
 	for _, msgDelivered := range gs.DeliveredMessages {
 		k.Delivered[msgDelivered.Id] = true

diff --git a/x/mailbox/keeper/keeper_test.go b/x/mailbox/keeper/keeper_test.go
@@ -14,17 +14,13 @@ import (
 	"github.com/strangelove-ventures/hyperlane-cosmos/x/mailbox/types"
 
 	"github.com/stretchr/testify/suite"
-
-	ismkeeper "github.com/strangelove-ventures/hyperlane-cosmos/x/ism/keeper"
 )
 
 type KeeperTestSuite struct {
 	suite.Suite
 
 	ctx         sdk.Context
-	ismctx      sdk.Context
 	keeper      keeper.Keeper
-	ismkeeper   ismkeeper.Keeper
 	queryClient types.QueryClient
 	msgServer   types.MsgServer
 

diff --git a/x/mailbox/types/errors.go b/x/mailbox/types/errors.go
@@ -1,6 +1,6 @@
 package types
 
-import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+import sdkerrors "cosmossdk.io/errors"
 
 var (
 	ErrInvalid                     = sdkerrors.Register(ModuleName, 1, "invalid")