From 0fdab06d40329a61b841acd9f23e97015a59fcec Mon Sep 17 00:00:00 2001 From: Srinivas Baride Date: Thu, 12 Aug 2021 21:59:08 +0530 Subject: [PATCH] Removed unnecessary methods from subscription keeper --- cmd/sentinelhub/cmd/root.go | 1 + export.go | 3 +- x/plan/genesis.go | 5 +- x/session/expected/keeper.go | 1 - x/session/keeper/alias.go | 4 -- x/subscription/genesis.go | 7 +-- x/subscription/keeper/msg_server.go | 3 -- x/subscription/keeper/subscription.go | 68 --------------------------- 8 files changed, 4 insertions(+), 88 deletions(-) diff --git a/cmd/sentinelhub/cmd/root.go b/cmd/sentinelhub/cmd/root.go index 77986b89..595148cf 100644 --- a/cmd/sentinelhub/cmd/root.go +++ b/cmd/sentinelhub/cmd/root.go @@ -86,6 +86,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { keys.Commands(hub.DefaultNodeHome), ) } + func addModuleInitFlags(startCmd *cobra.Command) { crisis.AddModuleInitFlags(startCmd) } diff --git a/export.go b/export.go index f8f36489..00a09241 100644 --- a/export.go +++ b/export.go @@ -4,13 +4,12 @@ import ( "encoding/json" "log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) func (a *App) ExportAppStateAndValidators( diff --git a/x/plan/genesis.go b/x/plan/genesis.go index 2d8c7510..9ae8d0de 100644 --- a/x/plan/genesis.go +++ b/x/plan/genesis.go @@ -34,10 +34,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, state types.GenesisState) { } } - var ( - count uint64 = 0 - ) - + count := uint64(0) for _, item := range state { if item.Plan.Id > count { count = item.Plan.Id diff --git a/x/session/expected/keeper.go b/x/session/expected/keeper.go index 06d30724..c70cfc67 100644 --- a/x/session/expected/keeper.go +++ b/x/session/expected/keeper.go @@ -30,7 +30,6 @@ type NodeKeeper interface { } type SubscriptionKeeper interface { - HasSubscriptionForNode(ctx sdk.Context, address hubtypes.NodeAddress, id uint64) bool GetSubscription(ctx sdk.Context, id uint64) (subscriptiontypes.Subscription, bool) GetActiveSubscriptionsForAddress(ctx sdk.Context, address sdk.AccAddress, skip, limit int64) subscriptiontypes.Subscriptions diff --git a/x/session/keeper/alias.go b/x/session/keeper/alias.go index 710f7699..6f221e62 100644 --- a/x/session/keeper/alias.go +++ b/x/session/keeper/alias.go @@ -30,10 +30,6 @@ func (k *Keeper) GetNode(ctx sdk.Context, address hubtypes.NodeAddress) (nodetyp return k.node.GetNode(ctx, address) } -func (k *Keeper) HasSubscriptionForNode(ctx sdk.Context, address hubtypes.NodeAddress, id uint64) bool { - return k.subscription.HasSubscriptionForNode(ctx, address, id) -} - func (k *Keeper) GetSubscription(ctx sdk.Context, id uint64) (subscriptiontypes.Subscription, bool) { return k.subscription.GetSubscription(ctx, id) } diff --git a/x/subscription/genesis.go b/x/subscription/genesis.go index 7d34347c..61cdabd0 100644 --- a/x/subscription/genesis.go +++ b/x/subscription/genesis.go @@ -10,15 +10,10 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, state *types.GenesisState) { k.SetParams(ctx, state.Params) + for _, item := range state.Subscriptions { k.SetSubscription(ctx, item.Subscription) - if item.Subscription.Id == 0 { - k.SetSubscriptionForNode(ctx, item.Subscription.GetNode(), item.Subscription.Id) - } else { - k.SetSubscriptionForPlan(ctx, item.Subscription.Plan, item.Subscription.Id) - } - for _, quota := range item.Quotas { k.SetQuota(ctx, item.Subscription.Id, quota) diff --git a/x/subscription/keeper/msg_server.go b/x/subscription/keeper/msg_server.go index a7a1766b..e706406c 100644 --- a/x/subscription/keeper/msg_server.go +++ b/x/subscription/keeper/msg_server.go @@ -66,11 +66,9 @@ func (k *msgServer) MsgSubscribeToNode(c context.Context, msg *types.MsgSubscrib Status: hubtypes.StatusActive, StatusAt: ctx.BlockTime(), } - subscriptionNode = subscription.GetNode() ) k.SetSubscription(ctx, subscription) - k.SetSubscriptionForNode(ctx, subscriptionNode, subscription.Id) ctx.EventManager().EmitTypedEvent( &types.EventSubscribeToNode{ Id: subscription.Id, @@ -159,7 +157,6 @@ func (k *msgServer) MsgSubscribeToPlan(c context.Context, msg *types.MsgSubscrib ) k.SetSubscription(ctx, subscription) - k.SetSubscriptionForPlan(ctx, subscription.Plan, subscription.Id) k.SetInactiveSubscriptionAt(ctx, subscription.Expiry, subscription.Id) ctx.EventManager().EmitTypedEvent( &types.EventSubscribeToPlan{ diff --git a/x/subscription/keeper/subscription.go b/x/subscription/keeper/subscription.go index 63e32691..733595ff 100644 --- a/x/subscription/keeper/subscription.go +++ b/x/subscription/keeper/subscription.go @@ -74,74 +74,6 @@ func (k *Keeper) GetSubscriptions(ctx sdk.Context, skip, limit int64) (items typ return items } -func (k *Keeper) SetSubscriptionForNode(ctx sdk.Context, address hubtypes.NodeAddress, id uint64) { - key := types.SubscriptionForNodeKey(address, id) - value := k.cdc.MustMarshalBinaryBare(&protobuf.BoolValue{Value: true}) - - store := k.Store(ctx) - store.Set(key, value) -} - -func (k *Keeper) HasSubscriptionForNode(ctx sdk.Context, address hubtypes.NodeAddress, id uint64) bool { - key := types.SubscriptionForNodeKey(address, id) - - store := k.Store(ctx) - return store.Has(key) -} - -func (k *Keeper) GetSubscriptionsForNode(ctx sdk.Context, address hubtypes.NodeAddress, skip, limit int64) (items types.Subscriptions) { - var ( - store = k.Store(ctx) - iter = hubtypes.NewPaginatedIterator( - sdk.KVStorePrefixIterator(store, types.GetSubscriptionForNodeKeyPrefix(address)), - ) - ) - - defer iter.Close() - - iter.Skip(skip) - iter.Limit(limit, func(iter sdk.Iterator) { - item, _ := k.GetSubscription(ctx, types.IDFromSubscriptionForNodeKey(iter.Key())) - items = append(items, item) - }) - - return items -} - -func (k *Keeper) SetSubscriptionForPlan(ctx sdk.Context, plan, id uint64) { - key := types.SubscriptionForPlanKey(plan, id) - value := k.cdc.MustMarshalBinaryBare(&protobuf.BoolValue{Value: true}) - - store := k.Store(ctx) - store.Set(key, value) -} - -func (k *Keeper) HasSubscriptionForPlan(ctx sdk.Context, plan, id uint64) bool { - key := types.SubscriptionForPlanKey(plan, id) - - store := k.Store(ctx) - return store.Has(key) -} - -func (k *Keeper) GetSubscriptionsForPlan(ctx sdk.Context, plan uint64, skip, limit int64) (items types.Subscriptions) { - var ( - store = k.Store(ctx) - iter = hubtypes.NewPaginatedIterator( - sdk.KVStorePrefixIterator(store, sdk.Uint64ToBigEndian(plan)), - ) - ) - - defer iter.Close() - - iter.Skip(skip) - iter.Limit(limit, func(iter sdk.Iterator) { - item, _ := k.GetSubscription(ctx, types.IDFromSubscriptionForPlanKey(iter.Key())) - items = append(items, item) - }) - - return items -} - func (k *Keeper) SetActiveSubscriptionForAddress(ctx sdk.Context, address sdk.AccAddress, id uint64) { key := types.ActiveSubscriptionForAddressKey(address, id) value := k.cdc.MustMarshalBinaryBare(&protobuf.BoolValue{Value: true})