From bafa9cdc3e32b24b006a72b4bf168a0aac4d5e8a Mon Sep 17 00:00:00 2001 From: victor118 Date: Wed, 21 Aug 2024 19:06:18 +0200 Subject: [PATCH] Fix lint check --- app/app.go | 7 ++-- app/export.go | 39 ++++++++++++++++++----- x/feeburn/ante/fee.go | 14 ++++---- x/tokenfactory/bindings/message_plugin.go | 10 +++--- x/tokenfactory/keeper/admins.go | 3 +- x/tokenfactory/testhelpers/authz.go | 2 +- x/tokenfactory/types/codec.go | 2 +- 7 files changed, 50 insertions(+), 27 deletions(-) diff --git a/app/app.go b/app/app.go index f6ec53c..b6f6e82 100644 --- a/app/app.go +++ b/app/app.go @@ -126,7 +126,6 @@ import ( ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibc "github.com/cosmos/ibc-go/v8/modules/core" - ibcclient "github.com/cosmos/ibc-go/v8/modules/core/02-client" ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" @@ -596,7 +595,6 @@ func New( govRouter := govv1beta1.NewRouter() govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). // This should be removed. It is still in place to avoid failures of modules that have not yet been upgraded. - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)). AddRoute(alliancemoduletypes.RouterKey, alliancemodule.NewAllianceProposalHandler(app.AllianceKeeper)) govConfig := govtypes.DefaultConfig() @@ -918,7 +916,10 @@ func New( app.mm.RegisterInvariants(app.CrisisKeeper) app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) - app.mm.RegisterServices(app.configurator) + err = app.mm.RegisterServices(app.configurator) + if err != nil { + panic(err) + } // app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) diff --git a/app/export.go b/app/export.go index 41dab9e..6e4367f 100644 --- a/app/export.go +++ b/app/export.go @@ -119,7 +119,7 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str ctx = ctx.WithBlockHeight(0) // reinitialize all validators - app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + err1 := app.StakingKeeper.IterateValidators(ctx, func(i int64, val stakingtypes.ValidatorI) (stop bool) { valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) if err != nil { panic(err) @@ -144,6 +144,9 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str } return false }) + if err1 != nil { + panic(err) + } // reinitialize all delegations for _, del := range dels { @@ -169,22 +172,34 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str /* Handle staking state. */ // iterate through redelegations, reset creation height - app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { + err = app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { for i := range red.Entries { red.Entries[i].CreationHeight = 0 } - app.StakingKeeper.SetRedelegation(ctx, red) + err := app.StakingKeeper.SetRedelegation(ctx, red) + if err != nil { + panic(err) + } return false }) + if err != nil { + panic(err) + } // iterate through unbonding delegations, reset creation height - app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { + err = app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { for i := range ubd.Entries { ubd.Entries[i].CreationHeight = 0 } - app.StakingKeeper.SetUnbondingDelegation(ctx, ubd) + err := app.StakingKeeper.SetUnbondingDelegation(ctx, ubd) + if err != nil { + panic(err) + } return false }) + if err != nil { + panic(err) + } // Iterate through validators by power descending, reset bond heights, and // update bond intra-tx counters. @@ -204,7 +219,10 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str validator.Jailed = true } - app.StakingKeeper.SetValidator(ctx, validator) + err := app.StakingKeeper.SetValidator(ctx, validator) + if err != nil { + panic(err) + } counter++ } @@ -217,12 +235,17 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str /* Handle slashing state. */ // reset start height on signing infos - app.SlashingKeeper.IterateValidatorSigningInfos( + err = app.SlashingKeeper.IterateValidatorSigningInfos( ctx, func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) { info.StartHeight = 0 - app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info) + if err := app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info); err != nil { + panic(err) + } return false }, ) + if err != nil { + panic(err) + } } diff --git a/x/feeburn/ante/fee.go b/x/feeburn/ante/fee.go index dfa5c5d..3f863c4 100644 --- a/x/feeburn/ante/fee.go +++ b/x/feeburn/ante/fee.go @@ -131,7 +131,7 @@ func (dfd DeductFeeDecorator) checkDeductFee(ctx sdk.Context, sdkTx sdk.Tx, fee } // DeductFees deducts fees from the given account. -func DeductFees(bankKeeper BankKeeper, ctx sdk.Context, acc types.AccountI, fees sdk.Coins, bp math.Int) error { +func DeductFees(bankKeeper BankKeeper, ctx sdk.Context, acc sdk.AccountI, fees sdk.Coins, bp math.Int) error { if !fees.IsValid() { return errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "invalid fee amount: %s", fees) } @@ -143,14 +143,14 @@ func DeductFees(bankKeeper BankKeeper, ctx sdk.Context, acc types.AccountI, fees burningFees = burningFees.Add(sdk.NewCoin(fee.Denom, burningAmount)) } - err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), types.FeeCollectorName, fees) - if err != nil { - return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + err1 := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), types.FeeCollectorName, fees) + if err1 != nil { + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, "%s", err1.Error()) } - err = bankKeeper.BurnCoins(ctx, types.FeeCollectorName, burningFees) - if err != nil { - return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + err2 := bankKeeper.BurnCoins(ctx, types.FeeCollectorName, burningFees) + if err2 != nil { + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, "%s", err2.Error()) } return nil diff --git a/x/tokenfactory/bindings/message_plugin.go b/x/tokenfactory/bindings/message_plugin.go index 296ed7b..0e5e58f 100644 --- a/x/tokenfactory/bindings/message_plugin.go +++ b/x/tokenfactory/bindings/message_plugin.go @@ -94,7 +94,7 @@ func PerformCreateDenom(f *tokenfactorykeeper.Keeper, b bankkeeper.Keeper, ctx s // Create denom resp, err := msgServer.CreateDenom( - sdk.WrapSDKContext(ctx), + ctx, msgCreateDenom, ) if err != nil { @@ -140,7 +140,7 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b bankkeeper.Keeper, ctx sdk.Cont // Mint through token factory / message server msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) - _, err = msgServer.Mint(sdk.WrapSDKContext(ctx), sdkMsg) + _, err = msgServer.Mint(ctx, sdkMsg) if err != nil { return errorsmod.Wrap(err, "minting coins from message") } @@ -181,7 +181,7 @@ func ChangeAdmin(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk } msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) - _, err = msgServer.ChangeAdmin(sdk.WrapSDKContext(ctx), changeAdminMsg) + _, err = msgServer.ChangeAdmin(ctx, changeAdminMsg) if err != nil { return errorsmod.Wrap(err, "failed changing admin from message") } @@ -215,7 +215,7 @@ func PerformBurn(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk // Burn through token factory / message server msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) - _, err := msgServer.Burn(sdk.WrapSDKContext(ctx), sdkMsg) + _, err := msgServer.Burn(ctx, sdkMsg) if err != nil { return errorsmod.Wrap(err, "burning coins from message") } @@ -256,7 +256,7 @@ func PerformForceTransfer(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contrac // Transfer through token factory / message server msgServer := tokenfactorykeeper.NewMsgServerImpl(*f) - _, err = msgServer.ForceTransfer(sdk.WrapSDKContext(ctx), sdkMsg) + _, err = msgServer.ForceTransfer(ctx, sdkMsg) if err != nil { return errorsmod.Wrap(err, "force transferring from message") } diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index d2541ba..9babf4b 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -5,7 +5,6 @@ import ( "github.com/ChihuahuaChain/chihuahua/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom @@ -51,7 +50,7 @@ func (k Keeper) setAdmin(ctx sdk.Context, denom string, admin string) error { func (k Keeper) validAccountForBurnOrForceTransfer(ctx sdk.Context, addressFrom string) error { accountI := k.accountKeeper.GetAccount(ctx, sdk.MustAccAddressFromBech32(addressFrom)) - _, ok := accountI.(authtypes.ModuleAccountI) + _, ok := accountI.(sdk.ModuleAccountI) if ok { return types.ErrBurnOrForceTransferFromModuleAccount } diff --git a/x/tokenfactory/testhelpers/authz.go b/x/tokenfactory/testhelpers/authz.go index dfa7865..a9d42d1 100644 --- a/x/tokenfactory/testhelpers/authz.go +++ b/x/tokenfactory/testhelpers/authz.go @@ -16,7 +16,7 @@ import ( var ( Amino = codec.NewLegacyAmino() - AuthzModuleCdc = codec.NewAminoCodec(Amino) + AuthzModuleCdc = codec.NewLegacyAmino() ) func init() { diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 9a07f3e..edcec7c 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -18,7 +18,7 @@ var ( ModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) // AminoCdc is a amino codec created to support amino JSON compatible msgs. - AminoCdc = codec.NewAminoCodec(amino) + AminoCdc = codec.NewLegacyAmino() ) const (