fix: basic lint issues

Author: ironman0x7b2

app/ante/handler.go

@@ -13,6 +13,7 @@ import (
 
 type HandlerOptions struct {
 	authante.HandlerOptions
+
 	IBCKeeper         *ibckeeper.Keeper
 	TxCounterStoreKey storetypes.StoreKey
 	WasmConfig        wasmtypes.WasmConfig
@@ -22,9 +23,11 @@ func NewHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
 	}
+
 	if options.BankKeeper == nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
 	}
+
 	if options.SignModeHandler == nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}

app/app.go

@@ -46,6 +46,7 @@ type App struct {
 	EncodingConfig
 	Keepers
 	StoreKeys
+
 	mm *sdkmodule.Manager
 	sm *sdkmodule.SimulationManager
 }
@@ -107,7 +108,7 @@ func NewApp(
 			tmos.Exit("failed to load the latest version: " + err.Error())
 		}
 
-		ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{})
+		ctx := app.NewUncachedContext(true, tmproto.Header{})
 		if err = app.WasmKeeper.InitializePinnedCodes(ctx); err != nil {
 			tmos.Exit("failed to initialize the pinned codes: " + err.Error())
 		}
@@ -135,6 +136,7 @@ func (a *App) InitChainer(ctx sdk.Context, req abcitypes.RequestInitChain) abcit
 	}
 
 	a.UpgradeKeeper.SetModuleVersionMap(ctx, a.mm.GetVersionMap())
+
 	return a.mm.InitGenesis(ctx, a.Codec, state)
 }
 
@@ -154,11 +156,11 @@ func (a *App) RegisterAPIRoutes(server *api.Server, _ serverconfig.APIConfig) {
 }
 
 func (a *App) RegisterTxService(ctx client.Context) {
-	authtx.RegisterTxService(a.BaseApp.GRPCQueryRouter(), ctx, a.BaseApp.Simulate, a.InterfaceRegistry)
+	authtx.RegisterTxService(a.GRPCQueryRouter(), ctx, a.Simulate, a.InterfaceRegistry)
 }
 
 func (a *App) RegisterTendermintService(ctx client.Context) {
-	tmservice.RegisterTendermintService(ctx, a.BaseApp.GRPCQueryRouter(), a.InterfaceRegistry, a.Query)
+	tmservice.RegisterTendermintService(ctx, a.GRPCQueryRouter(), a.InterfaceRegistry, a.Query)
 }
 
 func (a *App) RegisterNodeService(ctx client.Context) {
@@ -167,6 +169,7 @@ func (a *App) RegisterNodeService(ctx client.Context) {
 
 func (a *App) ModuleAccountAddrs() map[string]bool {
 	addrs := make(map[string]bool)
+
 	for v := range ModuleAccPerms() {
 		addr := authtypes.NewModuleAddress(v)
 		addrs[addr.String()] = true

app/export.go

@@ -20,10 +20,11 @@ func (a *App) ExportAppStateAndValidators(
 	height := a.LastBlockHeight() + 1
 	if forZeroHeight {
 		height = 0
+
 		a.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}
 
-	consensusParams := a.BaseApp.GetConsensusParams(ctx)
+	consensusParams := a.GetConsensusParams(ctx)
 	genState := a.mm.ExportGenesis(ctx, a.Codec)
 
 	validators, err := staking.WriteValidators(ctx, a.StakingKeeper)
@@ -45,11 +46,7 @@ func (a *App) ExportAppStateAndValidators(
 }
 
 func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
-	applyAllowedAddrs := false
-
-	if len(jailAllowedAddrs) > 0 {
-		applyAllowedAddrs = true
-	}
+	applyAllowedAddrs := len(jailAllowedAddrs) > 0
 
 	allowedAddrsMap := make(map[string]bool)
 
@@ -58,13 +55,15 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		if err != nil {
 			log.Fatal(err)
 		}
+
 		allowedAddrsMap[addr] = true
 	}
 
 	a.CrisisKeeper.AssertInvariants(ctx)
 
 	a.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
 		_, _ = a.DistributionKeeper.WithdrawValidatorCommission(ctx, val.GetOperator())
+
 		return false
 	})
 
@@ -79,6 +78,7 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		if err != nil {
 			panic(err)
 		}
+
 		_, _ = a.DistributionKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr)
 	}
 
@@ -96,6 +96,7 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		a.DistributionKeeper.SetFeePool(ctx, feePool)
 
 		a.DistributionKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator())
+
 		return false
 	})
 
@@ -104,10 +105,12 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		if err != nil {
 			panic(err)
 		}
+
 		delAddr, err := sdk.AccAddressFromBech32(del.DelegatorAddress)
 		if err != nil {
 			panic(err)
 		}
+
 		a.DistributionKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr)
 		a.DistributionKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr)
 	}
@@ -118,15 +121,19 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		for i := range red.Entries {
 			red.Entries[i].CreationHeight = 0
 		}
+
 		a.StakingKeeper.SetRedelegation(ctx, red)
+
 		return false
 	})
 
 	a.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
 		for i := range ubd.Entries {
 			ubd.Entries[i].CreationHeight = 0
 		}
+
 		a.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
+
 		return false
 	})
 
@@ -136,6 +143,7 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 
 	for ; iterator.Valid(); iterator.Next() {
 		addr := sdk.ValAddress(iterator.Key()[1:])
+
 		validator, found := a.StakingKeeper.GetValidator(ctx, addr)
 		if !found {
 			panic("expected validator, not found")
@@ -147,6 +155,7 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		}
 
 		a.StakingKeeper.SetValidator(ctx, validator)
+
 		counter++
 	}
 
@@ -162,6 +171,7 @@ func (a *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []strin
 		func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) {
 			info.StartHeight = 0
 			a.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info)
+
 			return false
 		},
 	)

app/keeper.go

@@ -124,6 +124,7 @@ type Keepers struct {
 
 func (k *Keepers) Subspace(v string) paramstypes.Subspace {
 	subspace, _ := k.ParamsKeeper.GetSubspace(v)
+
 	return subspace
 }
 
@@ -303,17 +304,19 @@ func NewKeepers(
 
 	// Cosmos IBC port router
 	var ibcICAControllerIBCModule ibcporttypes.IBCModule
+
 	ibcICAControllerIBCModule = ibcicacontroller.NewIBCMiddleware(ibcICAControllerIBCModule, k.IBCICAControllerKeeper)
 	ibcICAControllerIBCModule = ibcfee.NewIBCMiddleware(ibcICAControllerIBCModule, k.IBCFeeKeeper)
 
-	var ibcICAHostIBCModule ibcporttypes.IBCModule
-	ibcICAHostIBCModule = ibcicahost.NewIBCModule(k.IBCICAHostKeeper)
+	var ibcICAHostIBCModule ibcporttypes.IBCModule = ibcicahost.NewIBCModule(k.IBCICAHostKeeper)
 
 	var ibcTransferIBCModule ibcporttypes.IBCModule
+
 	ibcTransferIBCModule = ibctransfer.NewIBCModule(k.IBCTransferKeeper)
 	ibcTransferIBCModule = ibcfee.NewIBCMiddleware(ibcTransferIBCModule, k.IBCFeeKeeper)
 
 	var wasmIBCModule ibcporttypes.IBCModule
+
 	wasmIBCModule = wasm.NewIBCHandler(k.WasmKeeper, k.IBCKeeper.ChannelKeeper, k.IBCKeeper.ChannelKeeper)
 	wasmIBCModule = ibcfee.NewIBCMiddleware(wasmIBCModule, k.IBCFeeKeeper)
 
@@ -325,5 +328,6 @@ func NewKeepers(
 	k.IBCKeeper.SetRouter(ibcPortRouter)
 
 	k.CapabilityKeeper.Seal()
+
 	return k
 }

app/module.go

@@ -152,6 +152,7 @@ func ModuleAccPerms() map[string][]string {
 
 func BlockedAccAddrs() map[string]bool {
 	accAddrs := make(map[string]bool)
+
 	for v := range ModuleAccPerms() {
 		accAddr := authtypes.NewModuleAddress(v)
 		accAddrs[accAddr.String()] = true

app/upgrade.go

@@ -77,6 +77,7 @@ func UpgradeHandler(
 			if !ok {
 				return nil, fmt.Errorf("params subspace does not exist for module: %s", name)
 			}
+
 			if subspace.HasKeyTable() {
 				continue
 			}
@@ -98,12 +99,14 @@ func UpgradeHandler(
 		}
 
 		govParams := keepers.GovKeeper.GetParams(ctx)
+
 		govParams.MinInitialDepositRatio = sdkmath.LegacyNewDecWithPrec(2, 1).String()
 		if err := keepers.GovKeeper.SetParams(ctx, govParams); err != nil {
 			return nil, err
 		}
 
 		stakingParams := keepers.StakingKeeper.GetParams(ctx)
+
 		stakingParams.MinCommissionRate = sdkmath.LegacyNewDecWithPrec(5, 2)
 		if err := keepers.StakingKeeper.SetParams(ctx, stakingParams); err != nil {
 			return nil, err
@@ -116,6 +119,7 @@ func UpgradeHandler(
 			}
 
 			validator.Commission.Rate = stakingParams.MinCommissionRate
+
 			validator.Commission.UpdateTime = ctx.BlockTime()
 			if validator.Commission.MaxRate.LT(validator.Commission.Rate) {
 				validator.Commission.MaxRate = validator.Commission.Rate

cmd/sentinelhub/config.go

@@ -17,7 +17,7 @@ const flagOverwriteConfigWithDefaults = "overwrite-config-with-defaults"
 func applyRecommendedValues(cfg interface{}) {
 	switch c := cfg.(type) {
 	case *serverconfig.Config:
-		c.BaseConfig.MinGasPrices = "0.1udvpn"
+		c.MinGasPrices = "0.1udvpn"
 		c.StateSync.SnapshotInterval = 1000
 	case *tmcfg.Config:
 		c.Consensus.TimeoutCommit = 3 * time.Second
@@ -28,14 +28,17 @@ func applyRecommendedValues(cfg interface{}) {
 func initAppConfig() (string, interface{}) {
 	cfg := serverconfig.DefaultConfig()
 	cfgTemplate := serverconfig.DefaultConfigTemplate
+
 	applyRecommendedValues(cfg)
+
 	return cfgTemplate, cfg
 }
 
 // initTendermintConfig initializes the Tendermint configuration with defaults.
 func initTendermintConfig() *tmcfg.Config {
 	cfg := tmcfg.DefaultConfig()
 	applyRecommendedValues(cfg)
+
 	return cfg
 }
 
@@ -50,21 +53,25 @@ func overwriteConfig(name string, cfg interface{}, write func(string, interface{
 
 	v := viper.New()
 	v.SetConfigFile(cfgPath)
+
 	if err := v.ReadInConfig(); err != nil {
 		return err
 	}
+
 	if err := v.Unmarshal(cfg); err != nil {
 		return err
 	}
 
 	applyRecommendedValues(cfg)
+
 	return write(cfgPath, cfg)
 }
 
 // overwriteAppConfig updates and writes the app configuration.
 func overwriteAppConfig() error {
 	return overwriteConfig("app.toml", serverconfig.DefaultConfig(), func(cfgPath string, cfg interface{}) error {
 		serverconfig.WriteConfigFile(cfgPath, cfg.(*serverconfig.Config))
+
 		return nil
 	})
 }
@@ -73,6 +80,7 @@ func overwriteAppConfig() error {
 func overwriteTendermintConfig() error {
 	return overwriteConfig("config.toml", tmcfg.DefaultConfig(), func(cfgPath string, cfg interface{}) error {
 		tmcfg.WriteConfigFile(cfgPath, cfg.(*tmcfg.Config))
+
 		return nil
 	})
 }

cmd/sentinelhub/main.go

@@ -19,6 +19,7 @@ func HomeDir() (string, error) {
 	}
 
 	dir = path.Join(dir, ".sentinelhub")
+
 	return dir, nil
 }