diff --git a/app/app.go b/app/app.go index 66a14edeb..edc8c62c0 100644 --- a/app/app.go +++ b/app/app.go @@ -11,7 +11,6 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm" - wasmkeeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -243,7 +242,6 @@ type BanksyApp struct { ICQKeeper icqkeeper.Keeper FeeGrantKeeper feegrantkeeper.Keeper GroupKeeper groupkeeper.Keeper - WasmClientKeeper wasmkeeper.Keeper Wasm08Keeper wasm08.Keeper // TODO: use this name ? // make scoped keepers public for test purposes ScopedIBCKeeper capabilitykeeper.ScopedKeeper @@ -381,7 +379,7 @@ func NewBanksyApp( appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, ) - app.WasmClientKeeper = wasmkeeper.NewKeeper(appCodec, app.keys[wasmtypes.StoreKey]) + app.Wasm08Keeper = wasm08.NewKeeper(appCodec, app.keys[wasmtypes.StoreKey]) // Create Transfer Keepers app.TransferMiddlewareKeeper = transfermiddlewarekeeper.NewKeeper( keys[transfermiddlewaretypes.StoreKey], @@ -506,7 +504,7 @@ func NewBanksyApp( transferModule, icqModule, consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), - wasm.NewAppModule(app.WasmClientKeeper), + wasm.NewAppModule(app.Wasm08Keeper), routerModule, transfermiddlewareModule, alliancemodule.NewAppModule(appCodec, app.AllianceKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 77c44de78..bd5913c7e 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -10,7 +10,6 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmrand "github.com/cometbft/cometbft/libs/rand" - abcitypes1 "github.com/cometbft/cometbft/proto/tendermint/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -25,8 +24,8 @@ const ( // DefaultConsensusParams defines the default Tendermint consensus params used // in feeapp testing. -var DefaultConsensusParams = &abcitypes1.ConsensusParams{ - Block: &abcitypes1.BlockParams{ +var DefaultConsensusParams = &tmproto.ConsensusParams{ + Block: &tmproto.BlockParams{ MaxBytes: 200000, MaxGas: 2000000, }, @@ -44,7 +43,7 @@ var DefaultConsensusParams = &abcitypes1.ConsensusParams{ type EmptyAppOptions struct{} -func (EmptyAppOptions) Get(o string) interface{} { return nil } +func (EmptyAppOptions) Get(_ string) interface{} { return nil } func NewContextForApp(app banksy.BanksyApp) sdk.Context { ctx := app.BaseApp.NewContext(false, tmproto.Header{ diff --git a/app/ibctesting/chain.go b/app/ibctesting/chain.go index e213c8261..03b1ed402 100644 --- a/app/ibctesting/chain.go +++ b/app/ibctesting/chain.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "cosmossdk.io/errors" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/crypto/tmhash" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" @@ -18,7 +19,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" @@ -375,7 +376,7 @@ func (chain *TestChain) ConstructUpdateTMClientHeaderWithTrustedHeight(counterpa // NextValidatorsHash tmTrustedVals, ok = counterparty.GetValsAtHeight(int64(trustedHeight.RevisionHeight + 1)) if !ok { - return nil, sdkerrors.Wrapf(ibctmtypes.ErrInvalidHeaderHeight, "could not retrieve trusted validators at trustedHeight: %d", trustedHeight) + return nil, errors.Wrapf(ibctmtypes.ErrInvalidHeaderHeight, "could not retrieve trusted validators at trustedHeight: %d", trustedHeight) } } // inject trusted fields into last header @@ -428,7 +429,7 @@ func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, AppHash: chain.CurrentHeader.AppHash, LastResultsHash: tmhash.Sum([]byte("last_results_hash")), EvidenceHash: tmhash.Sum([]byte("evidence_hash")), - ProposerAddress: tmValSet.Proposer.Address, //nolint:staticcheck + ProposerAddress: tmValSet.Proposer.Address, } hhash := tmHeader.Hash() blockID := MakeBlockID(hhash, 3, tmhash.Sum([]byte("part_set"))) @@ -504,11 +505,11 @@ func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.Scope _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) if !ok { // create capability using the IBC capability keeper - cap, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), host.PortPath(portID)) + capability, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), host.PortPath(portID)) require.NoError(chain.t, err) // claim capability using the scopedKeeper - err = scopedKeeper.ClaimCapability(chain.GetContext(), cap, host.PortPath(portID)) + err = scopedKeeper.ClaimCapability(chain.GetContext(), capability, host.PortPath(portID)) require.NoError(chain.t, err) } @@ -520,10 +521,10 @@ func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.Scope // GetPortCapability returns the port capability for the given portID. The capability must // exist, otherwise testing will fail. func (chain *TestChain) GetPortCapability(portID string) *capabilitytypes.Capability { - cap, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) + capability, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) require.True(chain.t, ok) - return cap + return capability } // CreateChannelCapability binds and claims a capability for the given portID and channelID @@ -534,9 +535,9 @@ func (chain *TestChain) CreateChannelCapability(scopedKeeper capabilitykeeper.Sc // check if the portId is already binded, if not bind it _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), capName) if !ok { - cap, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), capName) + capability, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), capName) require.NoError(chain.t, err) - err = scopedKeeper.ClaimCapability(chain.GetContext(), cap, capName) + err = scopedKeeper.ClaimCapability(chain.GetContext(), capability, capName) require.NoError(chain.t, err) } @@ -548,10 +549,10 @@ func (chain *TestChain) CreateChannelCapability(scopedKeeper capabilitykeeper.Sc // GetChannelCapability returns the channel capability for the given portID and channelID. // The capability must exist, otherwise testing will fail. func (chain *TestChain) GetChannelCapability(portID, channelID string) *capabilitytypes.Capability { - cap, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) + capability, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) require.True(chain.t, ok) - return cap + return capability } func (chain *TestChain) TransferMiddleware() routerKeeper.Keeper { diff --git a/app/ibctesting/coordinator.go b/app/ibctesting/coordinator.go index b88a93a22..f8281fc47 100644 --- a/app/ibctesting/coordinator.go +++ b/app/ibctesting/coordinator.go @@ -204,19 +204,22 @@ func (coord *Coordinator) CommitNBlocks(chain *TestChain, n uint64) { // ConnOpenInitOnBothChains initializes a connection on both endpoints with the state INIT // using the OpenInit handshake call. func (coord *Coordinator) ConnOpenInitOnBothChains(path *Path) error { - if err := path.EndpointA.ConnOpenInit(); err != nil { + err := path.EndpointA.ConnOpenInit() + if err != nil { return err } - - if err := path.EndpointB.ConnOpenInit(); err != nil { + err = path.EndpointB.ConnOpenInit() + if err != nil { return err } - if err := path.EndpointA.UpdateClient(); err != nil { + err = path.EndpointA.UpdateClient() + if err != nil { return err } - if err := path.EndpointB.UpdateClient(); err != nil { + err = path.EndpointB.UpdateClient() + if err != nil { return err } @@ -229,19 +232,22 @@ func (coord *Coordinator) ChanOpenInitOnBothChains(path *Path) error { // NOTE: only creation of a capability for a transfer or mock port is supported // Other applications must bind to the port in InitGenesis or modify this code. - if err := path.EndpointA.ChanOpenInit(); err != nil { + err := path.EndpointA.ChanOpenInit() + if err != nil { return err } - - if err := path.EndpointB.ChanOpenInit(); err != nil { + err = path.EndpointB.ChanOpenInit() + if err != nil { return err } - if err := path.EndpointA.UpdateClient(); err != nil { + err = path.EndpointA.UpdateClient() + if err != nil { return err } - if err := path.EndpointB.UpdateClient(); err != nil { + err = path.EndpointB.UpdateClient() + if err != nil { return err } diff --git a/app/ibctesting/event_utils.go b/app/ibctesting/event_utils.go index 5cb54e409..a801402c8 100644 --- a/app/ibctesting/event_utils.go +++ b/app/ibctesting/event_utils.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" + abci "github.com/cometbft/cometbft/abci/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - abci "github.com/cometbft/cometbft/abci/types" ) func getSendPackets(evts []abci.Event) []channeltypes.Packet { @@ -59,8 +59,8 @@ func parsePacketFromEvent(evt abci.Event) channeltypes.Packet { // return the value for the attribute with the given name func getField(evt abci.Event, key string) string { for _, attr := range evt.Attributes { - if string(attr.Key) == key { - return string(attr.Value) + if attr.Key == key { + return attr.Value } } return "" diff --git a/app/ibctesting/simapp/ante_handler.go b/app/ibctesting/simapp/ante_handler.go index 5bd7bb567..44569e2e3 100644 --- a/app/ibctesting/simapp/ante_handler.go +++ b/app/ibctesting/simapp/ante_handler.go @@ -1,6 +1,7 @@ package simapp import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -19,13 +20,13 @@ type HandlerOptions struct { // NewAnteHandler creates a new ante handler func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { if options.AccountKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler") + return nil, errors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler") } if options.BankKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler") + return nil, errors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler") } if options.SignModeHandler == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for AnteHandler") + return nil, errors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for AnteHandler") } anteDecorators := []sdk.AnteDecorator{ diff --git a/app/ibctesting/simapp/app.go b/app/ibctesting/simapp/app.go index 1888e0b71..5462bdf06 100644 --- a/app/ibctesting/simapp/app.go +++ b/app/ibctesting/simapp/app.go @@ -68,7 +68,6 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/group" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" @@ -892,7 +891,7 @@ func (app *SimApp) RegisterNodeService(clientCtx client.Context) { } // RegisterSwaggerAPI registers swagger route with API Server -func RegisterSwaggerAPI(ctx client.Context, rtr *mux.Router) { +func RegisterSwaggerAPI(_ client.Context, rtr *mux.Router) { statikFS, err := fs.New() if err != nil { panic(err) @@ -935,14 +934,14 @@ func BlockedAddresses() map[string]bool { func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) - paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) + paramsKeeper.Subspace(authtypes.ModuleName) + paramsKeeper.Subspace(banktypes.ModuleName) paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable()) paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable()) - paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable()) - paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) - paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) + paramsKeeper.Subspace(distrtypes.ModuleName) + paramsKeeper.Subspace(slashingtypes.ModuleName) + paramsKeeper.Subspace(govtypes.ModuleName) + paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName) diff --git a/app/ibctesting/simapp/simd/cmd/root.go b/app/ibctesting/simapp/simd/cmd/root.go index 8115ad4bd..8eaeafdec 100644 --- a/app/ibctesting/simapp/simd/cmd/root.go +++ b/app/ibctesting/simapp/simd/cmd/root.go @@ -302,7 +302,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a // and exports state. func (a appCreator) appExport( logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string, - appOpts servertypes.AppOptions, modulesToExport []string, + appOpts servertypes.AppOptions, _ []string, ) (servertypes.ExportedApp, error) { var simApp *simapp.SimApp homePath, ok := appOpts.Get(flags.FlagHome).(string) diff --git a/app/ibctesting/simapp/test_helpers.go b/app/ibctesting/simapp/test_helpers.go index 6c61a0007..c72a08863 100644 --- a/app/ibctesting/simapp/test_helpers.go +++ b/app/ibctesting/simapp/test_helpers.go @@ -57,7 +57,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) { } // Setup initializes a new SimApp. A Nop logger is set in SimApp. -func Setup(isCheckTx bool) *SimApp { +func Setup(_ bool) *SimApp { privVal := mock.NewPV() pubKey, _ := privVal.GetPubKey() @@ -209,8 +209,8 @@ func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...ba // // CONTRACT: BeginBlock must be called before this function. func SignAndDeliver( - t *testing.T, txCfg client.TxConfig, app *bam.BaseApp, header tmproto.Header, msgs []sdk.Msg, - chainID string, accNums, accSeqs []uint64, expSimPass, expPass bool, priv ...cryptotypes.PrivKey, + t *testing.T, txCfg client.TxConfig, app *bam.BaseApp, _ tmproto.Header, msgs []sdk.Msg, + chainID string, accNums, accSeqs []uint64, _, expPass bool, priv ...cryptotypes.PrivKey, ) (sdk.GasInfo, *sdk.Result, error) { tx, err := simtestutil.GenSignedMockTx( rand.New(rand.NewSource(time.Now().UnixNano())), diff --git a/app/ibctesting/value.go b/app/ibctesting/value.go index 81a2167a6..f25d1509c 100644 --- a/app/ibctesting/value.go +++ b/app/ibctesting/value.go @@ -61,5 +61,5 @@ var ( MockFailPacketData = mock.MockFailPacketData MockRecvCanaryCapabilityName = mock.MockRecvCanaryCapabilityName - prefix = commitmenttypes.NewMerklePrefix([]byte("ibc")) + _ = commitmenttypes.NewMerklePrefix([]byte("ibc")) ) diff --git a/app/test_helpers.go b/app/test_helpers.go index 93a5e0c81..50fdb8c2d 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -11,6 +11,8 @@ import ( "testing" "time" + "cosmossdk.io/errors" + sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" @@ -23,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/snapshots/types" helpers "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" dbm "github.com/cometbft/cometbft-db" @@ -214,7 +216,7 @@ func createIncrementalAccounts(accNum int) []sdk.AccAddress { } // AddTestAddrsFromPubKeys adds the addresses into the WasmApp providing only the public keys. -func AddTestAddrsFromPubKeys(app *BanksyApp, ctx sdk.Context, pubKeys []cryptotypes.PubKey, accAmt sdk.Int) { +func AddTestAddrsFromPubKeys(app *BanksyApp, ctx sdk.Context, pubKeys []cryptotypes.PubKey, accAmt sdkmath.Int) { initCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), accAmt)) for _, pk := range pubKeys { @@ -224,17 +226,17 @@ func AddTestAddrsFromPubKeys(app *BanksyApp, ctx sdk.Context, pubKeys []cryptoty // AddTestAddrs constructs and returns accNum amount of accounts with an // initial balance of accAmt in random order -func AddTestAddrs(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sdk.AccAddress { +func AddTestAddrs(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdkmath.Int) []sdk.AccAddress { return addTestAddrs(app, ctx, accNum, accAmt, createRandomAccounts) } // AddTestAddrs constructs and returns accNum amount of accounts with an // initial balance of accAmt in random order -func AddTestAddrsIncremental(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sdk.AccAddress { +func AddTestAddrsIncremental(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdkmath.Int) []sdk.AccAddress { return addTestAddrs(app, ctx, accNum, accAmt, createIncrementalAccounts) } -func addTestAddrs(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdk.Int, strategy GenerateAccountStrategy) []sdk.AccAddress { +func addTestAddrs(app *BanksyApp, ctx sdk.Context, accNum int, accAmt sdkmath.Int, strategy GenerateAccountStrategy) []sdk.AccAddress { testAddrs := strategy(accNum) initCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), accAmt)) @@ -270,7 +272,7 @@ func ConvertAddrsToValAddrs(addrs []sdk.AccAddress) []sdk.ValAddress { return valAddrs } -func TestAddr(addr string, bech string) (sdk.AccAddress, error) { +func TestAddr(addr, bech string) (sdk.AccAddress, error) { res, err := sdk.AccAddressFromHexUnsafe(addr) if err != nil { return nil, err @@ -355,7 +357,7 @@ func SignCheckDeliver( // ibc testing package causes checkState and deliverState to diverge in block time. func SignAndDeliver( t *testing.T, txCfg client.TxConfig, app *baseapp.BaseApp, header tmproto.Header, msgs []sdk.Msg, - chainID string, accNums, accSeqs []uint64, expSimPass, expPass bool, priv ...cryptotypes.PrivKey, + chainID string, accNums, accSeqs []uint64, _, expPass bool, priv ...cryptotypes.PrivKey, ) (sdk.GasInfo, *sdk.Result, error) { tx, err := helpers.GenSignedMockTx( rand.New(rand.NewSource(time.Now().UnixNano())), @@ -391,7 +393,7 @@ func SignAndDeliver( // GenSequenceOfTxs generates a set of signed transactions of messages, such // that they differ only by having the sequence numbers incremented between // every transaction. -func GenSequenceOfTxs(txGen client.TxConfig, msgs []sdk.Msg, accNums []uint64, initSeqNums []uint64, numToGenerate int, priv ...cryptotypes.PrivKey) ([]sdk.Tx, error) { +func GenSequenceOfTxs(txGen client.TxConfig, msgs []sdk.Msg, accNums, initSeqNums []uint64, numToGenerate int, priv ...cryptotypes.PrivKey) ([]sdk.Tx, error) { txs := make([]sdk.Tx, numToGenerate) var err error for i := 0; i < numToGenerate; i++ { @@ -445,7 +447,7 @@ func NewPubKeyFromHex(pk string) (res cryptotypes.PubKey) { panic(err) } if len(pkBytes) != ed25519.PubKeySize { - panic(errors.Wrap(errors.ErrInvalidPubKey, "invalid pubkey size")) + panic(errors.Wrap(sdkerrors.ErrInvalidPubKey, "invalid pubkey size")) } return &ed25519.PubKey{Key: pkBytes} } @@ -454,7 +456,7 @@ func NewPubKeyFromHex(pk string) (res cryptotypes.PubKey) { type EmptyBaseAppOptions struct{} // Get implements AppOptions -func (ao EmptyBaseAppOptions) Get(o string) interface{} { +func (ao EmptyBaseAppOptions) Get(_ string) interface{} { return nil } diff --git a/go.mod b/go.mod index 733696367..5d29a042b 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,11 @@ require ( cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff github.com/cometbft/cometbft v0.37.0 github.com/cometbft/cometbft-db v0.7.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.1 github.com/cosmos/gogoproto v1.4.8 github.com/cosmos/ibc-go/v7 v7.0.0 + github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -35,10 +37,8 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect github.com/go-playground/locales v0.14.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect @@ -168,7 +168,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect pgregory.net/rapid v0.5.5 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/yaml v1.3.0 ) replace ( diff --git a/tests/interchaintest/ibc_transfer_test.go b/tests/interchaintest/ibc_transfer_test.go index 8f6cbccb9..204159165 100644 --- a/tests/interchaintest/ibc_transfer_test.go +++ b/tests/interchaintest/ibc_transfer_test.go @@ -61,8 +61,8 @@ func TestBanksyPicassoIBCTransfer(t *testing.T) { // Get both chains cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ { - //Name: "composable", - //Version: "seunlanlege/centauri-polkadot:v0.9.27,seunlanlege/centauri-parachain:v0.9.27", + // Name: "composable", + // Version: "seunlanlege/centauri-polkadot:v0.9.27,seunlanlege/centauri-parachain:v0.9.27", ChainName: "composable", // Set ChainName so that a suffix with a "dash" is not appended (required for hyperspace) ChainConfig: ibc.ChainConfig{ Type: "polkadot", @@ -77,7 +77,7 @@ func TestBanksyPicassoIBCTransfer(t *testing.T) { { Repository: "seunlanlege/centauri-parachain", Version: "v0.9.27", - //UidGid: "1025:1025", + // UidGid: "1025:1025", }, }, Bin: "polkadot", @@ -110,7 +110,7 @@ func TestBanksyPicassoIBCTransfer(t *testing.T) { GasAdjustment: 1.3, TrustingPeriod: "504h", CoinType: "118", - //EncodingConfig: WasmClientEncoding(), + // EncodingConfig: WasmClientEncoding(), NoHostMount: true, ConfigFileOverrides: configFileOverrides, ModifyGenesis: modifyGenesisShortProposals(votingPeriod, maxDepositPeriod), @@ -289,8 +289,8 @@ func TestBanksyPicassoIBCTransfer(t *testing.T) { fmt.Println("********* Test passed **********") fmt.Println("********************************") - //err = testutil.WaitForBlocks(ctx, 50, banksyd, composable) - //require.NoError(t, err) + // err = testutil.WaitForBlocks(ctx, 50, banksyd, composable) + // require.NoError(t, err) } func pushWasmContractViaGov(t *testing.T, ctx context.Context, banksyd *cosmos.CosmosChain) string { @@ -337,7 +337,7 @@ func pushWasmContractViaGov(t *testing.T, ctx context.Context, banksyd *cosmos.C return codeHash } -func fundUsers(t *testing.T, ctx context.Context, fundAmount int64, composable ibc.Chain, banksyd ibc.Chain) (ibc.Wallet, ibc.Wallet) { +func fundUsers(t *testing.T, ctx context.Context, fundAmount int64, composable, banksyd ibc.Chain) (ibc.Wallet, ibc.Wallet) { users := interchaintest.GetAndFundTestUsers(t, ctx, "user", fundAmount, composable, banksyd) polkadotUser, cosmosUser := users[0], users[1] err := testutil.WaitForBlocks(ctx, 2, composable, banksyd) // Only waiting 1 block is flaky for parachain diff --git a/tests/interchaintest/polkadot_chain_test.go b/tests/interchaintest/polkadot_chain_test.go index 02ce26285..f79788371 100644 --- a/tests/interchaintest/polkadot_chain_test.go +++ b/tests/interchaintest/polkadot_chain_test.go @@ -86,7 +86,7 @@ func TestPolkadotComposableChainStart(t *testing.T) { PARACHAIN_DEFAULT_AMOUNT := 1_152_921_504_606_847_000 RELAYCHAIN_DEFAULT_AMOUNT := 1_100_000_000_000_000_000 FAUCET_AMOUNT := 100_000_000_000_000_000 // set in interchain.go/global - //RELAYER_AMOUNT := 1_000_000_000_000 // set in interchain.go/global + // RELAYER_AMOUNT := 1_000_000_000_000 // set in interchain.go/global // Check the faucet amounts polkadotFaucetAddress, err := polkadotChain.GetAddress(ctx, "faucet") @@ -216,5 +216,4 @@ func TestPolkadotComposableChainStart(t *testing.T) { require.NoError(t, err) fmt.Println("Parachain user2 amount: ", parachainUser2Amount) require.Equal(t, fundAmount+txAmount, parachainUser2Amount, "Final parachain user2 amount not expected") - } diff --git a/tests/interchaintest/push_wasm_client_code_test.go b/tests/interchaintest/push_wasm_client_code_test.go index 6db9f753b..f34570328 100644 --- a/tests/interchaintest/push_wasm_client_code_test.go +++ b/tests/interchaintest/push_wasm_client_code_test.go @@ -16,7 +16,7 @@ import ( "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - //simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + // simappparams "github.com/cosmos/cosmos-sdk/simapp/params" ) const ( @@ -55,36 +55,37 @@ func TestPushWasmClientCode(t *testing.T) { rpcOverrides["max_header_bytes"] = 2_100_000 configTomlOverrides["rpc"] = rpcOverrides - //mempoolOverrides := make(testutil.Toml) - //mempoolOverrides["max_tx_bytes"] = 6000000 - //configTomlOverrides["mempool"] = mempoolOverrides + // mempoolOverrides := make(testutil.Toml) + // mempoolOverrides["max_tx_bytes"] = 6000000 + // configTomlOverrides["mempool"] = mempoolOverrides configFileOverrides["config/app.toml"] = appTomlOverrides configFileOverrides["config/config.toml"] = configTomlOverrides cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ - {ChainConfig: ibc.ChainConfig{ - Type: "cosmos", - Name: "banksy", - ChainID: "banksyd", - Images: []ibc.DockerImage{ - { - Repository: "ghcr.io/notional-labs/banksy", - Version: "2.0.1", - UidGid: "1025:1025", + { + ChainConfig: ibc.ChainConfig{ + Type: "cosmos", + Name: "banksy", + ChainID: "banksyd", + Images: []ibc.DockerImage{ + { + Repository: "ghcr.io/notional-labs/banksy", + Version: "2.0.1", + UidGid: "1025:1025", + }, }, + Bin: "banksyd", + Bech32Prefix: "banksy", + Denom: "stake", + GasPrices: "0.00stake", + GasAdjustment: 1.3, + TrustingPeriod: "504h", + // EncodingConfig: WasmClientEncoding(), + NoHostMount: true, + ConfigFileOverrides: configFileOverrides, + ModifyGenesis: modifyGenesisShortProposals(votingPeriod, maxDepositPeriod), }, - Bin: "banksyd", - Bech32Prefix: "banksy", - Denom: "stake", - GasPrices: "0.00stake", - GasAdjustment: 1.3, - TrustingPeriod: "504h", - //EncodingConfig: WasmClientEncoding(), - NoHostMount: true, - ConfigFileOverrides: configFileOverrides, - ModifyGenesis: modifyGenesisShortProposals(votingPeriod, maxDepositPeriod), - }, }, }) @@ -165,7 +166,7 @@ type GetCodeQueryMsgResponse struct { Code []byte `json:"code"` } -func modifyGenesisShortProposals(votingPeriod string, maxDepositPeriod string) func(ibc.ChainConfig, []byte) ([]byte, error) { +func modifyGenesisShortProposals(votingPeriod, maxDepositPeriod string) func(ibc.ChainConfig, []byte) ([]byte, error) { return func(chainConfig ibc.ChainConfig, genbz []byte) ([]byte, error) { g := make(map[string]interface{}) if err := json.Unmarshal(genbz, &g); err != nil { diff --git a/x/mint/module.go b/x/mint/module.go index 44c5dc85f..4edf601a6 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -39,7 +39,7 @@ func (AppModuleBasic) Name() string { } // RegisterLegacyAminoCodec registers the mint module's types on the given LegacyAmino codec. -func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {} +func (AppModuleBasic) RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {} // RegisterInterfaces registers the module's interface types func (b AppModuleBasic) RegisterInterfaces(_ cdctypes.InterfaceRegistry) {} @@ -51,7 +51,7 @@ func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { } // ValidateGenesis performs genesis state validation for the mint module. -func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error { +func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingConfig, bz json.RawMessage) error { var data types.GenesisState if err := cdc.UnmarshalJSON(bz, &data); err != nil { return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err) diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index 85b6d776c..68fb5765b 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -1,13 +1,14 @@ package types // noalias import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" ) // StakingKeeper defines the expected staking keeper type StakingKeeper interface { - StakingTokenSupply(ctx sdk.Context) sdk.Int + StakingTokenSupply(ctx sdk.Context) math.Int BondedRatio(ctx sdk.Context) sdk.Dec } diff --git a/x/mint/types/minter.go b/x/mint/types/minter.go index 3285d6ddf..38f0b77c5 100644 --- a/x/mint/types/minter.go +++ b/x/mint/types/minter.go @@ -3,6 +3,7 @@ package types import ( "fmt" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -68,7 +69,7 @@ func (m Minter) NextInflationRate(params Params, bondedRatio sdk.Dec) sdk.Dec { // NextAnnualProvisions returns the annual provisions based on current total // supply and inflation rate. -func (m Minter) NextAnnualProvisions(_ Params, totalSupply sdk.Int) sdk.Dec { +func (m Minter) NextAnnualProvisions(_ Params, totalSupply math.Int) sdk.Dec { return m.Inflation.MulInt(totalSupply) } diff --git a/x/mint/types/params.go b/x/mint/types/params.go index 273325336..2bdfa970f 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -109,7 +109,8 @@ func validateMintDenom(i interface{}) error { if strings.TrimSpace(v) == "" { return errors.New("mint denom cannot be blank") } - if err := sdk.ValidateDenom(v); err != nil { + err := sdk.ValidateDenom(v) + if err != nil { return err } diff --git a/x/transfermiddleware/ibc_middleware.go b/x/transfermiddleware/ibc_middleware.go index b9903b8b3..a60224aec 100644 --- a/x/transfermiddleware/ibc_middleware.go +++ b/x/transfermiddleware/ibc_middleware.go @@ -1,6 +1,7 @@ package transfermiddleware import ( + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -112,14 +113,16 @@ func (im IBCMiddleware) OnRecvPacket( func (im IBCMiddleware) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) } - if err := im.app.OnTimeoutPacket(ctx, packet, relayer); err != nil { + err := im.app.OnTimeoutPacket(ctx, packet, relayer) + if err != nil { return err } - if err := im.keeper.OnTimeoutPacket(ctx, packet, data); err != nil { + err = im.keeper.OnTimeoutPacket(ctx, packet, data) + if err != nil { return err } @@ -133,11 +136,12 @@ func (im IBCMiddleware) OnAcknowledgementPacket( acknowledgement []byte, relayer sdk.AccAddress, ) error { - if err := im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer); err != nil { + err := im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) + if err != nil { return err } - - if err := im.keeper.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer); err != nil { + err = im.keeper.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) + if err != nil { return err } @@ -148,7 +152,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket( func (im IBCMiddleware) SendPacket( ctx sdk.Context, chanCap *capabilitytypes.Capability, - sourcePort string, sourceChannel string, + sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, diff --git a/x/transfermiddleware/keeper/genesis.go b/x/transfermiddleware/keeper/genesis.go index a6941de28..c421c8f59 100644 --- a/x/transfermiddleware/keeper/genesis.go +++ b/x/transfermiddleware/keeper/genesis.go @@ -14,6 +14,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { } // ExportGenesis returns the x/transfermiddleware module's exported genesis. -func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { +func (k Keeper) ExportGenesis(_ sdk.Context) *types.GenesisState { return &types.GenesisState{} } diff --git a/x/transfermiddleware/keeper/ics4wrapper.go b/x/transfermiddleware/keeper/ics4wrapper.go index 7978c4a74..6e1cd8a7c 100644 --- a/x/transfermiddleware/keeper/ics4wrapper.go +++ b/x/transfermiddleware/keeper/ics4wrapper.go @@ -3,9 +3,9 @@ package keeper import ( "fmt" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" @@ -21,8 +21,8 @@ func (keeper Keeper) hasParachainIBCTokenInfo(ctx sdk.Context, nativeDenom strin func (keeper Keeper) handleOverrideSendPacketTransferLogic( ctx sdk.Context, - chanCap *capabilitytypes.Capability, - sourcePort string, sourceChannel string, + _ *capabilitytypes.Capability, + sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, @@ -86,19 +86,18 @@ func (keeper Keeper) handleOverrideSendPacketTransferLogic( return res.Sequence, nil } -func (k Keeper) executeTransferMsg(ctx sdk.Context, transferMsg *transfertypes.MsgTransfer) (*transfertypes.MsgTransferResponse, error) { +func (keeper Keeper) executeTransferMsg(ctx sdk.Context, transferMsg *transfertypes.MsgTransfer) (*transfertypes.MsgTransferResponse, error) { if err := transferMsg.ValidateBasic(); err != nil { return nil, fmt.Errorf("bad msg %v", err.Error()) } - return k.transferKeeper.Transfer(sdk.WrapSDKContext(ctx), transferMsg) - + return keeper.transferKeeper.Transfer(sdk.WrapSDKContext(ctx), transferMsg) } // SendPacket wraps IBC ChannelKeeper's SendPacket function -func (k Keeper) SendPacket( +func (keeper Keeper) SendPacket( ctx sdk.Context, chanCap *capabilitytypes.Capability, - sourcePort string, sourceChannel string, + sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte, @@ -110,48 +109,48 @@ func (k Keeper) SendPacket( return 0, err } // check if denom in fungibleTokenPacketData is native denom in parachain info and - parachainInfo := k.GetParachainIBCTokenInfo(ctx, fungibleTokenPacketData.Denom) + parachainInfo := keeper.GetParachainIBCTokenInfo(ctx, fungibleTokenPacketData.Denom) if parachainInfo.ChannelId != sourceChannel || parachainInfo.NativeDenom != fungibleTokenPacketData.Denom { - return k.ICS4Wrapper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) + return keeper.ICS4Wrapper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) } - return k.handleOverrideSendPacketTransferLogic(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) + return keeper.handleOverrideSendPacketTransferLogic(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) } // WriteAcknowledgement wraps IBC ICS4Wrapper WriteAcknowledgement function. // ICS29 WriteAcknowledgement is used for asynchronous acknowledgements. -func (k *Keeper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, acknowledgement ibcexported.Acknowledgement) error { - return k.ICS4Wrapper.WriteAcknowledgement(ctx, chanCap, packet, acknowledgement) +func (keeper *Keeper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, acknowledgement ibcexported.Acknowledgement) error { + return keeper.ICS4Wrapper.WriteAcknowledgement(ctx, chanCap, packet, acknowledgement) } // WriteAcknowledgement wraps IBC ICS4Wrapper GetAppVersion function. -func (k *Keeper) GetAppVersion( +func (keeper *Keeper) GetAppVersion( ctx sdk.Context, portID, channelID string, ) (string, bool) { - return k.ICS4Wrapper.GetAppVersion(ctx, portID, channelID) + return keeper.ICS4Wrapper.GetAppVersion(ctx, portID, channelID) } -func (k *Keeper) OnAcknowledgementPacket( +func (keeper *Keeper) OnAcknowledgementPacket( ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, - relayer sdk.AccAddress, + _ sdk.AccAddress, ) error { var ack channeltypes.Acknowledgement if err := transfertypes.ModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) } var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) + return errors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet data: %s", err.Error()) } switch ack.Response.(type) { case *channeltypes.Acknowledgement_Error: - return k.refundToken(ctx, packet, data) + return keeper.refundToken(ctx, packet, data) default: // the acknowledgement succeeded on the receiving chain so nothing // needs to be executed and no error needs to be returned @@ -159,13 +158,13 @@ func (k *Keeper) OnAcknowledgementPacket( } } -func (k Keeper) refundToken(ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData) error { +func (keeper Keeper) refundToken(ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData) error { // parse the denomination from the full denom path trace := transfertypes.ParseDenomTrace(data.Denom) // parse the transfer amount transferAmount, ok := sdk.NewIntFromString(data.Amount) if !ok { - return sdkerrors.Wrapf(transfertypes.ErrInvalidAmount, "unable to parse transfer amount (%s) into math.Int", data.Amount) + return errors.Wrapf(transfertypes.ErrInvalidAmount, "unable to parse transfer amount (%s) into math.Int", data.Amount) } token := sdk.NewCoin(trace.IBCDenom(), transferAmount) @@ -177,13 +176,13 @@ func (k Keeper) refundToken(ctx sdk.Context, packet channeltypes.Packet, data tr if transfertypes.SenderChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) { // Do nothing - // This case should never happend + // This case should never happened return nil } - nativeDenom := k.GetNativeDenomByIBCDenomSecondaryIndex(ctx, trace.IBCDenom()) - paraTokenInfo := k.GetParachainIBCTokenInfo(ctx, nativeDenom) + nativeDenom := keeper.GetNativeDenomByIBCDenomSecondaryIndex(ctx, trace.IBCDenom()) + paraTokenInfo := keeper.GetParachainIBCTokenInfo(ctx, nativeDenom) // only trigger if source channel is from parachain. - if !k.hasParachainIBCTokenInfo(ctx, nativeDenom) { + if !keeper.hasParachainIBCTokenInfo(ctx, nativeDenom) { return nil } @@ -191,16 +190,16 @@ func (k Keeper) refundToken(ctx sdk.Context, packet channeltypes.Packet, data tr nativeToken := sdk.NewCoin(paraTokenInfo.NativeDenom, transferAmount) // send IBC token to escrow address ibc token escrowAddress := transfertypes.GetEscrowAddress(transfertypes.PortID, paraTokenInfo.ChannelId) - if err := k.bankKeeper.SendCoins(ctx, sender, escrowAddress, sdk.NewCoins(token)); err != nil { + if err := keeper.bankKeeper.SendCoins(ctx, sender, escrowAddress, sdk.NewCoins(token)); err != nil { panic(fmt.Sprintf("unable to send coins from account to module despite previously minting coins to module account: %v", err)) } // mint native token and send back to sender - if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, sdk.NewCoins(nativeToken)); err != nil { + if err := keeper.bankKeeper.MintCoins(ctx, types.ModuleName, sdk.NewCoins(nativeToken)); err != nil { return err } - if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sender, sdk.NewCoins(nativeToken)); err != nil { + if err := keeper.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sender, sdk.NewCoins(nativeToken)); err != nil { panic(fmt.Sprintf("unable to send coins from module to account despite previously minting coins to module account: %v", err)) } } diff --git a/x/transfermiddleware/keeper/keeper.go b/x/transfermiddleware/keeper/keeper.go index 1dae479ab..5c37160df 100644 --- a/x/transfermiddleware/keeper/keeper.go +++ b/x/transfermiddleware/keeper/keeper.go @@ -41,14 +41,14 @@ func NewKeeper( // TODO: testing // AddParachainIBCTokenInfo add new parachain token information token to chain state. -func (keeper Keeper) AddParachainIBCInfo(ctx sdk.Context, ibcDenom, channelId, nativeDenom string) error { +func (keeper Keeper) AddParachainIBCInfo(ctx sdk.Context, ibcDenom, channelID, nativeDenom string) error { if keeper.hasParachainIBCTokenInfo(ctx, nativeDenom) { return types.ErrDuplicateParachainIBCTokenInfo } info := types.ParachainIBCTokenInfo{ IbcDenom: ibcDenom, - ChannelId: channelId, + ChannelId: channelID, NativeDenom: nativeDenom, } @@ -72,17 +72,17 @@ func (keeper Keeper) RemoveParachainIBCInfo(ctx sdk.Context, nativeDenom string) } // get the IBCdenom - IBCDenom := keeper.GetParachainIBCTokenInfo(ctx, nativeDenom).IbcDenom + ibcDenom := keeper.GetParachainIBCTokenInfo(ctx, nativeDenom).IbcDenom store := ctx.KVStore(keeper.storeKey) store.Delete(types.GetKeyParachainIBCTokenInfo(nativeDenom)) // update the IBCdenom-native index - if !store.Has(types.GetKeyIBCDenomAndNativeIndex(IBCDenom)) { + if !store.Has(types.GetKeyIBCDenomAndNativeIndex(ibcDenom)) { panic("broken data in state") } - store.Delete(types.GetKeyIBCDenomAndNativeIndex(IBCDenom)) + store.Delete(types.GetKeyIBCDenomAndNativeIndex(ibcDenom)) return nil } @@ -98,13 +98,13 @@ func (keeper Keeper) GetParachainIBCTokenInfo(ctx sdk.Context, nativeDenom strin return info } -func (keeper Keeper) GetNativeDenomByIBCDenomSecondaryIndex(ctx sdk.Context, IBCdenom string) string { +func (keeper Keeper) GetNativeDenomByIBCDenomSecondaryIndex(ctx sdk.Context, ibcDenom string) string { store := ctx.KVStore(keeper.storeKey) - bz := store.Get(types.GetKeyParachainIBCTokenInfo(IBCdenom)) + bz := store.Get(types.GetKeyParachainIBCTokenInfo(ibcDenom)) return string(bz) } -func (k Keeper) Logger(ctx sdk.Context) log.Logger { +func (keeper Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", "x/"+exported.ModuleName+"-"+types.ModuleName) } diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index 6dd5c66dd..128b941fd 100644 --- a/x/transfermiddleware/relay_test.go +++ b/x/transfermiddleware/relay_test.go @@ -32,7 +32,6 @@ func (suite *TransferMiddlewareTestSuite) SetupTest() { suite.chainA = suite.coordinator.GetChain(customibctesting.GetChainID(1)) suite.chainB = suite.coordinator.GetChain(customibctesting.GetChainID(2)) suite.chainC = suite.coordinator.GetChain(customibctesting.GetChainID(3)) - } func NewTransferPath(chainA, chainB *customibctesting.TestChain) *customibctesting.Path { @@ -43,7 +42,6 @@ func NewTransferPath(chainA, chainB *customibctesting.TestChain) *customibctesti path.EndpointB.ChannelConfig.Version = ibctransfertypes.Version return path - } func TestKeeperTestSuite(t *testing.T) { @@ -210,7 +208,6 @@ func (suite *TransferMiddlewareTestSuite) TestOnrecvPacket() { sdk.NewCoin(sdk.DefaultBondDenom, transferAmount), func() { expChainBBalanceDiff = ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, transferAmount) - }, }, { @@ -280,13 +277,12 @@ func (suite *TransferMiddlewareTestSuite) TestSendPacket() { ) var ( expChainBBalanceDiff sdk.Coin - path = NewTransferPath(suite.chainA, suite.chainB) expChainABalanceDiff = sdk.NewCoin(sdk.DefaultBondDenom, transferAmount) ) suite.SetupTest() // reset - path = NewTransferPath(suite.chainA, suite.chainB) + path := NewTransferPath(suite.chainA, suite.chainB) suite.coordinator.Setup(path) // Add parachain token info @@ -365,13 +361,12 @@ func (suite *TransferMiddlewareTestSuite) TestTimeOutPacket() { ) var ( expChainBBalanceDiff sdk.Coin - path = NewTransferPath(suite.chainA, suite.chainB) expChainABalanceDiff = sdk.NewCoin(sdk.DefaultBondDenom, transferAmount) ) suite.SetupTest() // reset - path = NewTransferPath(suite.chainA, suite.chainB) + path := NewTransferPath(suite.chainA, suite.chainB) suite.coordinator.Setup(path) // Add parachain token info diff --git a/x/transfermiddleware/types/errors.go b/x/transfermiddleware/types/errors.go index 9e6a849cc..6af13dd84 100644 --- a/x/transfermiddleware/types/errors.go +++ b/x/transfermiddleware/types/errors.go @@ -1,7 +1,7 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) var ( diff --git a/x/transfermiddleware/types/excepted_keepers.go b/x/transfermiddleware/types/excepted_keepers.go index 1ae5d5756..1dbabb083 100644 --- a/x/transfermiddleware/types/excepted_keepers.go +++ b/x/transfermiddleware/types/excepted_keepers.go @@ -13,7 +13,7 @@ type BankKeeper interface { BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error - SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error BlockedAddr(addr sdk.AccAddress) bool GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins } diff --git a/x/transfermiddleware/types/keys.go b/x/transfermiddleware/types/keys.go index f9244ffda..fdb509112 100644 --- a/x/transfermiddleware/types/keys.go +++ b/x/transfermiddleware/types/keys.go @@ -26,6 +26,6 @@ func GetKeyParachainIBCTokenInfo(nativeDenom string) []byte { return append(KeysParachainIBCTokenInfo, []byte(nativeDenom)...) } -func GetKeyIBCDenomAndNativeIndex(IBCdenom string) []byte { - return append(KeysParachainIBCTokenInfo, []byte(IBCdenom)...) +func GetKeyIBCDenomAndNativeIndex(ibcDenom string) []byte { + return append(KeysParachainIBCTokenInfo, []byte(ibcDenom)...) } diff --git a/x/transfermiddleware/types/msg.go b/x/transfermiddleware/types/msg.go index 7b77654dd..716474552 100644 --- a/x/transfermiddleware/types/msg.go +++ b/x/transfermiddleware/types/msg.go @@ -1,8 +1,8 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) @@ -26,7 +26,8 @@ func (msg *MsgAddParachainIBCTokenInfo) ValidateBasic() error { } // validate channelId - if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil { + err := host.ChannelIdentifierValidator(msg.ChannelId) + if err != nil { return err } @@ -58,13 +59,13 @@ func (msg *MsgRemoveParachainIBCTokenInfo) ValidateBasic() error { func NewMsgAddParachainIBCTokenInfo( authority string, ibcDenom string, - channelId string, + channelID string, nativeDenom string, ) *MsgAddParachainIBCTokenInfo { return &MsgAddParachainIBCTokenInfo{ Authority: authority, IbcDenom: ibcDenom, - ChannelId: channelId, + ChannelId: channelID, NativeDenom: nativeDenom, } }