Revert "chore: address some linter complaints (#7734)"

This reverts commit 83fdb7f.

modules/apps/29-fee/types/keys.go

@@ -97,7 +97,7 @@ func KeyCounterpartyPayee(address, channelID string) []byte {
 }
 
 // ParseKeyCounterpartyPayee returns the registered relayer address and channelID used to store the counterparty payee address
-func ParseKeyCounterpartyPayee(key string) (address string, channelID string, err error) {
+func ParseKeyCounterpartyPayee(key string) (address string, channelID string, error error) {
 	keySplit := strings.Split(key, "/")
 	if len(keySplit) != 3 {
 		return "", "", errorsmod.Wrapf(

simapp/app.go

@@ -138,6 +138,7 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
 	ibcconnectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"
 	porttypes "github.com/cosmos/ibc-go/v9/modules/core/05-port/types"
+	"github.com/cosmos/ibc-go/v9/modules/core/exported"
 	ibcexported "github.com/cosmos/ibc-go/v9/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v9/modules/core/keeper"
 	solomachine "github.com/cosmos/ibc-go/v9/modules/light-clients/06-solomachine"
@@ -320,7 +321,7 @@ func NewSimApp(
 	// voteExtOp := func(bApp *baseapp.BaseApp) {
 	//	voteExtHandler := NewVoteExtensionHandler()
 	//	voteExtHandler.SetHandlers(bApp)
-	// }
+	//}
 	// baseAppOptions = append(baseAppOptions, voteExtOp, baseapp.SetOptimisticExecution(),
 	//	baseapp.SetIncludeNestedMsgsGas([]sdk.Msg{&govv1.MsgSubmitProposal{}}))
 
@@ -538,7 +539,7 @@ func NewSimApp(
 	// IBC Fee Module keeper
 	app.IBCFeeKeeper = ibcfeekeeper.NewKeeper(
 		appCodec,
-		runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibcfeetypes.ModuleName))),
+		runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", exported.ModuleName, ibcfeetypes.ModuleName))),
 		app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware
 		app.IBCKeeper.ChannelKeeper,
 		app.AuthKeeper, app.BankKeeper,
@@ -574,7 +575,7 @@ func NewSimApp(
 	// since fee middleware will wrap the IBCKeeper for underlying application.
 	app.TransferKeeper = ibctransferkeeper.NewKeeper(
 		appCodec,
-		runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibctransfertypes.ModuleName))),
+		runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", exported.ModuleName, ibctransfertypes.ModuleName))),
 		app.GetSubspace(ibctransfertypes.ModuleName),
 		app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware
 		app.IBCKeeper.ChannelKeeper,
@@ -958,8 +959,8 @@ func (app *SimApp) EndBlocker(ctx sdk.Context) (sdk.EndBlock, error) {
 	return app.ModuleManager.EndBlock(ctx)
 }
 
-func (app *SimApp) Configurator() module.Configurator { //nolint:staticcheck // SA1019: Configurator is deprecated but still used in runtime v1.
-	return app.configurator
+func (a *SimApp) Configurator() module.Configurator { //nolint:staticcheck // SA1019: Configurator is deprecated but still used in runtime v1.
+	return a.configurator
 }
 
 // InitChainer application update at chain initialization
@@ -1016,8 +1017,8 @@ func (app *SimApp) AutoCliOpts() autocli.AppOptions {
 }
 
 // DefaultGenesis returns a default genesis from the registered AppModule's.
-func (app *SimApp) DefaultGenesis() map[string]json.RawMessage {
-	return app.ModuleManager.DefaultGenesis()
+func (a *SimApp) DefaultGenesis() map[string]json.RawMessage {
+	return a.ModuleManager.DefaultGenesis()
 }
 
 // GetKey returns the KVStoreKey for the provided store key.
@@ -1094,7 +1095,7 @@ func (app *SimApp) RegisterNodeService(clientCtx client.Context, cfg config.Conf
 
 // ValidatorKeyProvider returns a function that generates a validator key
 // Supported key types are those supported by Comet: ed25519, secp256k1, bls12-381
-func (*SimApp) ValidatorKeyProvider() runtime.KeyGenF {
+func (app *SimApp) ValidatorKeyProvider() runtime.KeyGenF {
 	return func() (cmtcrypto.PrivKey, error) {
 		return cmted25519.GenPrivKey(), nil
 	}

testing/chain.go

@@ -138,7 +138,7 @@ func NewTestChainWithValSet(tb testing.TB, coord *Coordinator, chainID string, v
 	app := SetupWithGenesisValSet(tb, valSet, genAccs, chainID, sdk.DefaultPowerReduction, genBals...)
 
 	// create current header and call begin block
-	cmtHeader := cmtproto.Header{
+	header := cmtproto.Header{
 		ChainID: chainID,
 		Height:  1,
 		Time:    coord.CurrentTime.UTC(),
@@ -152,7 +152,7 @@ func NewTestChainWithValSet(tb testing.TB, coord *Coordinator, chainID string, v
 		Coordinator:       coord,
 		ChainID:           chainID,
 		App:               app,
-		ProposedHeader:    cmtHeader,
+		ProposedHeader:    header,
 		TxConfig:          txConfig,
 		Codec:             app.AppCodec(),
 		Vals:              valSet,
@@ -595,7 +595,7 @@ func (chain *TestChain) DeleteKey(key []byte) {
 
 // IBCClientHeader will construct a 07-tendermint Header to update the light client
 // on the counterparty chain. The trustedHeight must be passed in as a non-zero height.
-func (chain *TestChain) IBCClientHeader(ibcHeader *ibctm.Header, trustedHeight clienttypes.Height) (*ibctm.Header, error) {
+func (chain *TestChain) IBCClientHeader(header *ibctm.Header, trustedHeight clienttypes.Height) (*ibctm.Header, error) {
 	if trustedHeight.IsZero() {
 		return nil, errorsmod.Wrap(ibctm.ErrInvalidHeaderHeight, "trustedHeight must be a non-zero height")
 	}
@@ -610,11 +610,11 @@ func (chain *TestChain) IBCClientHeader(ibcHeader *ibctm.Header, trustedHeight c
 		return nil, err
 	}
 
-	ibcHeader.TrustedHeight = trustedHeight
+	header.TrustedHeight = trustedHeight
 	trustedVals.TotalVotingPower = cmtTrustedVals.TotalVotingPower()
-	ibcHeader.TrustedValidators = trustedVals
+	header.TrustedValidators = trustedVals
 
-	return ibcHeader, nil
+	return header, nil
 }
 
 // GetSenderAccount returns the sender account associated with the provided private key.