From e187b8e57aa94e8a899d5842e87f459f845e63fb Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 20 Dec 2023 00:13:13 +0700 Subject: [PATCH] linted, with the exception of unreachable code --- app/app.go | 2 +- custom/staking/keeper/msg_server.go | 1 - custom/staking/module.go | 17 ++++++++--------- x/stakingmiddleware/keeper/keeper.go | 12 +++++------- x/stakingmiddleware/keeper/msg_server.go | 1 - x/stakingmiddleware/module.go | 3 +-- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/app.go b/app/app.go index a97da5804..fe5e82fe8 100644 --- a/app/app.go +++ b/app/app.go @@ -361,7 +361,7 @@ func NewComposableApp( mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), - customstaking.NewAppModule(appCodec, *&app.CustomStakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), + customstaking.NewAppModule(appCodec, app.CustomStakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), stakingmiddleware.NewAppModule(appCodec, app.StakingMiddlewareKeeper), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), upgrade.NewAppModule(app.UpgradeKeeper), diff --git a/custom/staking/keeper/msg_server.go b/custom/staking/keeper/msg_server.go index 6066bba54..5004f8f86 100644 --- a/custom/staking/keeper/msg_server.go +++ b/custom/staking/keeper/msg_server.go @@ -29,7 +29,6 @@ func (k msgServer) EditValidator(goCtx context.Context, msg *types.MsgEditValida } func (k msgServer) Delegate(goCtx context.Context, msg *types.MsgDelegate) (*types.MsgDelegateResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) // bondDenom := k.BondDenom(ctx) diff --git a/custom/staking/module.go b/custom/staking/module.go index 6f982554b..8c2ec5b75 100644 --- a/custom/staking/module.go +++ b/custom/staking/module.go @@ -7,9 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" stakingmodule "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking/exported" - "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/cosmos/cosmos-sdk/x/staking/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" // custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" customstakingkeeper "github.com/notional-labs/composable/v6/custom/staking/keeper" @@ -23,7 +22,7 @@ type AppModule struct { } // NewAppModule creates a new AppModule object -func NewAppModule(cdc codec.Codec, keeper customstakingkeeper.Keeper, accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, ss exported.Subspace) AppModule { +func NewAppModule(cdc codec.Codec, keeper customstakingkeeper.Keeper, accountKeeper stakingtypes.AccountKeeper, bankKeeper stakingtypes.BankKeeper, ss exported.Subspace) AppModule { stakingModule := stakingmodule.NewAppModule(cdc, &keeper.Keeper, accountKeeper, bankKeeper, ss) return AppModule{ AppModule: stakingModule, @@ -37,20 +36,20 @@ func NewAppModule(cdc codec.Codec, keeper customstakingkeeper.Keeper, accountKee // when trying to force this custom keeper into a bankkeeper.BaseKeeper func (am AppModule) RegisterServices(cfg module.Configurator) { // types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(&am.keeper)) - types.RegisterMsgServer(cfg.MsgServer(), customstakingkeeper.NewMsgServerImpl(am.keeper.Keeper, am.keeper)) - querier := keeper.Querier{Keeper: &am.keeper.Keeper} - types.RegisterQueryServer(cfg.QueryServer(), querier) + stakingtypes.RegisterMsgServer(cfg.MsgServer(), customstakingkeeper.NewMsgServerImpl(am.keeper.Keeper, am.keeper)) + querier := stakingkeeper.Querier{Keeper: &am.keeper.Keeper} + stakingtypes.RegisterQueryServer(cfg.QueryServer(), querier) m := stakingkeeper.NewMigrator(&am.keeper.Keeper, am.subspace) - if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { + if err := cfg.RegisterMigration(stakingtypes.ModuleName, 1, m.Migrate1to2); err != nil { panic(fmt.Sprintf("failed to migrate x/staking from version 1 to 2: %v", err)) } - if err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate2to3); err != nil { + if err := cfg.RegisterMigration(stakingtypes.ModuleName, 2, m.Migrate2to3); err != nil { panic(fmt.Sprintf("failed to migrate x/staking from version 2 to 3: %v", err)) } - if err := cfg.RegisterMigration(types.ModuleName, 3, m.Migrate3to4); err != nil { + if err := cfg.RegisterMigration(stakingtypes.ModuleName, 3, m.Migrate3to4); err != nil { panic(fmt.Sprintf("failed to migrate x/staking from version 3 to 4: %v", err)) } } diff --git a/x/stakingmiddleware/keeper/keeper.go b/x/stakingmiddleware/keeper/keeper.go index 95f2c9fa8..4d19d25bd 100644 --- a/x/stakingmiddleware/keeper/keeper.go +++ b/x/stakingmiddleware/keeper/keeper.go @@ -1,7 +1,6 @@ package keeper import ( - "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" @@ -9,7 +8,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - // "github.com/notional-labs/composable/v6/x/mint/types" sdkmath "cosmossdk.io/math" ) @@ -82,18 +80,18 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { // } // SetLastTotalPower Set the last total validator power. -func (k Keeper) SetLastTotalPower(ctx sdk.Context, power math.Int) { +func (k Keeper) SetLastTotalPower(ctx sdk.Context, power sdkmath.Int) { store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(&sdk.IntProto{Int: power}) store.Set(types.DelegationKey, bz) } -func (k Keeper) GetLastTotalPower(ctx sdk.Context) math.Int { +func (k Keeper) GetLastTotalPower(ctx sdk.Context) sdkmath.Int { store := ctx.KVStore(k.storeKey) bz := store.Get(types.DelegationKey) if bz == nil { - return math.ZeroInt() + return sdkmath.ZeroInt() } ip := sdk.IntProto{} @@ -102,8 +100,8 @@ func (k Keeper) GetLastTotalPower(ctx sdk.Context) math.Int { return ip.Int } -func (k Keeper) SetDelegation(ctx sdk.Context, DelegatorAddress string, ValidatorAddress string, Denom string, Amount sdkmath.Int) { - delegation := types.Delegation{DelegatorAddress: DelegatorAddress, ValidatorAddress: ValidatorAddress, Amount: sdk.NewCoin(Denom, Amount)} +func (k Keeper) SetDelegation(ctx sdk.Context, sourceDelegatorAddress, validatorAddress, denom string, amount sdkmath.Int) { + delegation := types.Delegation{DelegatorAddress: sourceDelegatorAddress, ValidatorAddress: validatorAddress, Amount: sdk.NewCoin(denom, amount)} delegatorAddress := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress) store := ctx.KVStore(k.storeKey) diff --git a/x/stakingmiddleware/keeper/msg_server.go b/x/stakingmiddleware/keeper/msg_server.go index 79056c132..30afdf83b 100644 --- a/x/stakingmiddleware/keeper/msg_server.go +++ b/x/stakingmiddleware/keeper/msg_server.go @@ -22,6 +22,5 @@ func NewMsgServerImpl(k Keeper) types.MsgServer { // UpdateParams updates the params. func (ms msgServer) SetPower(goCtx context.Context, req *types.MsgSetPower) (*types.MsgSetPowerResponse, error) { - return &types.MsgSetPowerResponse{}, nil } diff --git a/x/stakingmiddleware/module.go b/x/stakingmiddleware/module.go index 881d954d7..0cf65e3f4 100644 --- a/x/stakingmiddleware/module.go +++ b/x/stakingmiddleware/module.go @@ -20,7 +20,6 @@ import ( "github.com/notional-labs/composable/v6/x/stakingmiddleware/client/cli" "github.com/notional-labs/composable/v6/x/stakingmiddleware/keeper" "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" - middlewarestaking "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" ) var ( @@ -38,7 +37,7 @@ var _ module.AppModuleBasic = AppModuleBasic{} // Name returns the mint module's name. func (AppModuleBasic) Name() string { - return middlewarestaking.ModuleName + return types.ModuleName } // RegisterLegacyAminoCodec registers the mint module's types on the given LegacyAmino codec.