From e2a815d249c510aaba38e6e05c584531e96b72e6 Mon Sep 17 00:00:00 2001 From: Tony Stark Date: Thu, 13 Feb 2025 16:56:13 +0530 Subject: [PATCH] chore: moved expected package to keeper --- .../keeper.go => keeper/expected.go} | 2 +- x/deposit/keeper/keeper.go | 5 ++-- .../keeper.go => keeper/expected.go} | 2 +- x/lease/keeper/keeper.go | 21 ++++++++-------- .../keeper.go => keeper/expected.go} | 2 +- x/mint/keeper/keeper.go | 5 ++-- .../keeper.go => keeper/expected.go} | 2 +- x/node/keeper/keeper.go | 21 ++++++++-------- .../keeper.go => keeper/expected.go} | 2 +- x/plan/keeper/keeper.go | 21 ++++++++-------- .../keeper.go => keeper/expected.go} | 2 +- x/provider/keeper/keeper.go | 13 +++++----- .../keeper.go => keeper/expected.go} | 2 +- x/session/keeper/keeper.go | 17 ++++++------- .../keeper.go => keeper/expected.go} | 2 +- x/subscription/keeper/keeper.go | 25 +++++++++---------- .../keeper.go => keeper/expected.go} | 2 +- x/swap/keeper/keeper.go | 7 +++--- x/vpn/app_module.go | 7 +++--- .../keeper.go => keeper/expected.go} | 2 +- x/vpn/keeper/keeper.go | 5 ++-- 21 files changed, 78 insertions(+), 89 deletions(-) rename x/deposit/{expected/keeper.go => keeper/expected.go} (96%) rename x/lease/{expected/keeper.go => keeper/expected.go} (98%) rename x/mint/{expected/keeper.go => keeper/expected.go} (95%) rename x/node/{expected/keeper.go => keeper/expected.go} (99%) rename x/plan/{expected/keeper.go => keeper/expected.go} (99%) rename x/provider/{expected/keeper.go => keeper/expected.go} (97%) rename x/session/{expected/keeper.go => keeper/expected.go} (98%) rename x/subscription/{expected/keeper.go => keeper/expected.go} (99%) rename x/swap/{expected/keeper.go => keeper/expected.go} (96%) rename x/vpn/{expected/keeper.go => keeper/expected.go} (98%) diff --git a/x/deposit/expected/keeper.go b/x/deposit/keeper/expected.go similarity index 96% rename from x/deposit/expected/keeper.go rename to x/deposit/keeper/expected.go index 2cbdc05ed..81474caf9 100644 --- a/x/deposit/expected/keeper.go +++ b/x/deposit/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/deposit/keeper/keeper.go b/x/deposit/keeper/keeper.go index a424c3f00..d33dbb1de 100644 --- a/x/deposit/keeper/keeper.go +++ b/x/deposit/keeper/keeper.go @@ -9,7 +9,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/deposit/expected" "github.com/sentinel-official/hub/v12/x/deposit/types" ) @@ -17,7 +16,7 @@ type Keeper struct { key storetypes.StoreKey cdc codec.BinaryCodec - bank expected.BankKeeper + bank BankKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey) Keeper { @@ -27,7 +26,7 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey) Keeper { } } -func (k *Keeper) WithBankKeeper(keeper expected.BankKeeper) { +func (k *Keeper) WithBankKeeper(keeper BankKeeper) { k.bank = keeper } diff --git a/x/lease/expected/keeper.go b/x/lease/keeper/expected.go similarity index 98% rename from x/lease/expected/keeper.go rename to x/lease/keeper/expected.go index e5ec06849..8c2c17d2d 100644 --- a/x/lease/expected/keeper.go +++ b/x/lease/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lease/keeper/keeper.go b/x/lease/keeper/keeper.go index 751a749c8..689ed01ca 100644 --- a/x/lease/keeper/keeper.go +++ b/x/lease/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/lease/expected" "github.com/sentinel-official/hub/v12/x/lease/types" ) @@ -21,11 +20,11 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - deposit expected.DepositKeeper - node expected.NodeKeeper - oracle expected.OracleKeeper - plan expected.PlanKeeper - provider expected.ProviderKeeper + deposit DepositKeeper + node NodeKeeper + oracle OracleKeeper + plan PlanKeeper + provider ProviderKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter, authority, feeCollectorName string) Keeper { @@ -38,23 +37,23 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithDepositKeeper(keeper expected.DepositKeeper) { +func (k *Keeper) WithDepositKeeper(keeper DepositKeeper) { k.deposit = keeper } -func (k *Keeper) WithNodeKeeper(keeper expected.NodeKeeper) { +func (k *Keeper) WithNodeKeeper(keeper NodeKeeper) { k.node = keeper } -func (k *Keeper) WithOracleKeeper(keeper expected.OracleKeeper) { +func (k *Keeper) WithOracleKeeper(keeper OracleKeeper) { k.oracle = keeper } -func (k *Keeper) WithPlanKeeper(keeper expected.PlanKeeper) { +func (k *Keeper) WithPlanKeeper(keeper PlanKeeper) { k.plan = keeper } -func (k *Keeper) WithProviderKeeper(keeper expected.ProviderKeeper) { +func (k *Keeper) WithProviderKeeper(keeper ProviderKeeper) { k.provider = keeper } diff --git a/x/mint/expected/keeper.go b/x/mint/keeper/expected.go similarity index 95% rename from x/mint/expected/keeper.go rename to x/mint/keeper/expected.go index d3f25ab5f..456421d34 100644 --- a/x/mint/expected/keeper.go +++ b/x/mint/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 0caec5dca..de936d6ff 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -6,7 +6,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/mint/expected" "github.com/sentinel-official/hub/v12/x/mint/types" ) @@ -14,10 +13,10 @@ type Keeper struct { cdc codec.BinaryCodec key storetypes.StoreKey - mint expected.MintKeeper + mint MintKeeper } -func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, mint expected.MintKeeper) Keeper { +func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, mint MintKeeper) Keeper { return Keeper{ cdc: cdc, key: key, diff --git a/x/node/expected/keeper.go b/x/node/keeper/expected.go similarity index 99% rename from x/node/expected/keeper.go rename to x/node/keeper/expected.go index 8173d328b..d1d99c35d 100644 --- a/x/node/expected/keeper.go +++ b/x/node/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( "time" diff --git a/x/node/keeper/keeper.go b/x/node/keeper/keeper.go index 07ffeabc1..3c0b2a8e2 100644 --- a/x/node/keeper/keeper.go +++ b/x/node/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/node/expected" "github.com/sentinel-official/hub/v12/x/node/types" ) @@ -21,11 +20,11 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - deposit expected.DepositKeeper - distribution expected.DistributionKeeper - lease expected.LeaseKeeper - oracle expected.OracleKeeper - session expected.SessionKeeper + deposit DepositKeeper + distribution DistributionKeeper + lease LeaseKeeper + oracle OracleKeeper + session SessionKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter, authority, feeCollectorName string) Keeper { @@ -38,23 +37,23 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithDepositKeeper(keeper expected.DepositKeeper) { +func (k *Keeper) WithDepositKeeper(keeper DepositKeeper) { k.deposit = keeper } -func (k *Keeper) WithDistributionKeeper(keeper expected.DistributionKeeper) { +func (k *Keeper) WithDistributionKeeper(keeper DistributionKeeper) { k.distribution = keeper } -func (k *Keeper) WithLeaseKeeper(keeper expected.LeaseKeeper) { +func (k *Keeper) WithLeaseKeeper(keeper LeaseKeeper) { k.lease = keeper } -func (k *Keeper) WithOracleKeeper(keeper expected.OracleKeeper) { +func (k *Keeper) WithOracleKeeper(keeper OracleKeeper) { k.oracle = keeper } -func (k *Keeper) WithSessionKeeper(keeper expected.SessionKeeper) { +func (k *Keeper) WithSessionKeeper(keeper SessionKeeper) { k.session = keeper } diff --git a/x/plan/expected/keeper.go b/x/plan/keeper/expected.go similarity index 99% rename from x/plan/expected/keeper.go rename to x/plan/keeper/expected.go index aef0cb076..facdaaf1e 100644 --- a/x/plan/expected/keeper.go +++ b/x/plan/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/plan/keeper/keeper.go b/x/plan/keeper/keeper.go index 2fc5e9c82..467edb9a1 100644 --- a/x/plan/keeper/keeper.go +++ b/x/plan/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/plan/expected" "github.com/sentinel-official/hub/v12/x/plan/types" ) @@ -19,11 +18,11 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - lease expected.LeaseKeeper - node expected.NodeKeeper - provider expected.ProviderKeeper - session expected.SessionKeeper - subscription expected.SubscriptionKeeper + lease LeaseKeeper + node NodeKeeper + provider ProviderKeeper + session SessionKeeper + subscription SubscriptionKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter) Keeper { @@ -34,23 +33,23 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithLeaseKeeper(keeper expected.LeaseKeeper) { +func (k *Keeper) WithLeaseKeeper(keeper LeaseKeeper) { k.lease = keeper } -func (k *Keeper) WithNodeKeeper(keeper expected.NodeKeeper) { +func (k *Keeper) WithNodeKeeper(keeper NodeKeeper) { k.node = keeper } -func (k *Keeper) WithProviderKeeper(keeper expected.ProviderKeeper) { +func (k *Keeper) WithProviderKeeper(keeper ProviderKeeper) { k.provider = keeper } -func (k *Keeper) WithSessionKeeper(keeper expected.SessionKeeper) { +func (k *Keeper) WithSessionKeeper(keeper SessionKeeper) { k.session = keeper } -func (k *Keeper) WithSubscriptionKeeper(keeper expected.SubscriptionKeeper) { +func (k *Keeper) WithSubscriptionKeeper(keeper SubscriptionKeeper) { k.subscription = keeper } diff --git a/x/provider/expected/keeper.go b/x/provider/keeper/expected.go similarity index 97% rename from x/provider/expected/keeper.go rename to x/provider/keeper/expected.go index 24fc26ee1..f168f0a78 100644 --- a/x/provider/expected/keeper.go +++ b/x/provider/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/provider/keeper/keeper.go b/x/provider/keeper/keeper.go index 95701875f..9d79523da 100644 --- a/x/provider/keeper/keeper.go +++ b/x/provider/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/provider/expected" "github.com/sentinel-official/hub/v12/x/provider/types" ) @@ -20,9 +19,9 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - distribution expected.DistributionKeeper - plan expected.PlanKeeper - lease expected.LeaseKeeper + distribution DistributionKeeper + plan PlanKeeper + lease LeaseKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter, authority string) Keeper { @@ -34,15 +33,15 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithDistributionKeeper(keeper expected.DistributionKeeper) { +func (k *Keeper) WithDistributionKeeper(keeper DistributionKeeper) { k.distribution = keeper } -func (k *Keeper) WithPlanKeeper(keeper expected.PlanKeeper) { +func (k *Keeper) WithPlanKeeper(keeper PlanKeeper) { k.plan = keeper } -func (k *Keeper) WithLeaseKeeper(keeper expected.LeaseKeeper) { +func (k *Keeper) WithLeaseKeeper(keeper LeaseKeeper) { k.lease = keeper } diff --git a/x/session/expected/keeper.go b/x/session/keeper/expected.go similarity index 98% rename from x/session/expected/keeper.go rename to x/session/keeper/expected.go index 391340e2d..ffb535e91 100644 --- a/x/session/expected/keeper.go +++ b/x/session/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdkmath "cosmossdk.io/math" diff --git a/x/session/keeper/keeper.go b/x/session/keeper/keeper.go index e4f9e3ba5..fd718bbd8 100644 --- a/x/session/keeper/keeper.go +++ b/x/session/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/session/expected" "github.com/sentinel-official/hub/v12/x/session/types" ) @@ -21,10 +20,10 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - account expected.AccountKeeper - deposit expected.DepositKeeper - node expected.NodeKeeper - subscription expected.SubscriptionKeeper + account AccountKeeper + deposit DepositKeeper + node NodeKeeper + subscription SubscriptionKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter, authority, feeCollectorName string) Keeper { @@ -37,19 +36,19 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithAccountKeeper(keeper expected.AccountKeeper) { +func (k *Keeper) WithAccountKeeper(keeper AccountKeeper) { k.account = keeper } -func (k *Keeper) WithDepositKeeper(keeper expected.DepositKeeper) { +func (k *Keeper) WithDepositKeeper(keeper DepositKeeper) { k.deposit = keeper } -func (k *Keeper) WithNodeKeeper(keeper expected.NodeKeeper) { +func (k *Keeper) WithNodeKeeper(keeper NodeKeeper) { k.node = keeper } -func (k *Keeper) WithSubscriptionKeeper(keeper expected.SubscriptionKeeper) { +func (k *Keeper) WithSubscriptionKeeper(keeper SubscriptionKeeper) { k.subscription = keeper } diff --git a/x/subscription/expected/keeper.go b/x/subscription/keeper/expected.go similarity index 99% rename from x/subscription/expected/keeper.go rename to x/subscription/keeper/expected.go index 6b489c523..00b870a8a 100644 --- a/x/subscription/expected/keeper.go +++ b/x/subscription/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( "time" diff --git a/x/subscription/keeper/keeper.go b/x/subscription/keeper/keeper.go index 9d80c4fe0..27f1c4890 100644 --- a/x/subscription/keeper/keeper.go +++ b/x/subscription/keeper/keeper.go @@ -10,7 +10,6 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sentinel-official/hub/v12/x/subscription/expected" "github.com/sentinel-official/hub/v12/x/subscription/types" ) @@ -21,12 +20,12 @@ type Keeper struct { key storetypes.StoreKey router *baseapp.MsgServiceRouter - bank expected.BankKeeper - node expected.NodeKeeper - oracle expected.OracleKeeper - plan expected.PlanKeeper - provider expected.ProviderKeeper - session expected.SessionKeeper + bank BankKeeper + node NodeKeeper + oracle OracleKeeper + plan PlanKeeper + provider ProviderKeeper + session SessionKeeper } func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.MsgServiceRouter, authority, feeCollectorName string) Keeper { @@ -39,27 +38,27 @@ func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, router *baseapp.M } } -func (k *Keeper) WithBankKeeper(keeper expected.BankKeeper) { +func (k *Keeper) WithBankKeeper(keeper BankKeeper) { k.bank = keeper } -func (k *Keeper) WithProviderKeeper(keeper expected.ProviderKeeper) { +func (k *Keeper) WithProviderKeeper(keeper ProviderKeeper) { k.provider = keeper } -func (k *Keeper) WithNodeKeeper(keeper expected.NodeKeeper) { +func (k *Keeper) WithNodeKeeper(keeper NodeKeeper) { k.node = keeper } -func (k *Keeper) WithOracleKeeper(keeper expected.OracleKeeper) { +func (k *Keeper) WithOracleKeeper(keeper OracleKeeper) { k.oracle = keeper } -func (k *Keeper) WithPlanKeeper(keeper expected.PlanKeeper) { +func (k *Keeper) WithPlanKeeper(keeper PlanKeeper) { k.plan = keeper } -func (k *Keeper) WithSessionKeeper(keeper expected.SessionKeeper) { +func (k *Keeper) WithSessionKeeper(keeper SessionKeeper) { k.session = keeper } diff --git a/x/swap/expected/keeper.go b/x/swap/keeper/expected.go similarity index 96% rename from x/swap/expected/keeper.go rename to x/swap/keeper/expected.go index f0a6fc3f5..c5435762d 100644 --- a/x/swap/expected/keeper.go +++ b/x/swap/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/swap/keeper/keeper.go b/x/swap/keeper/keeper.go index 15b9b19f6..0478898ba 100644 --- a/x/swap/keeper/keeper.go +++ b/x/swap/keeper/keeper.go @@ -7,7 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/sentinel-official/hub/v12/x/swap/expected" "github.com/sentinel-official/hub/v12/x/swap/types" "github.com/sentinel-official/hub/v12/x/swap/types/v1" ) @@ -17,11 +16,11 @@ type Keeper struct { key storetypes.StoreKey params paramstypes.Subspace - account expected.AccountKeeper - bank expected.BankKeeper + account AccountKeeper + bank BankKeeper } -func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, params paramstypes.Subspace, account expected.AccountKeeper, bank expected.BankKeeper) Keeper { +func NewKeeper(cdc codec.BinaryCodec, key storetypes.StoreKey, params paramstypes.Subspace, account AccountKeeper, bank BankKeeper) Keeper { return Keeper{ cdc: cdc, key: key, diff --git a/x/vpn/app_module.go b/x/vpn/app_module.go index 881894f51..f591cd4d4 100644 --- a/x/vpn/app_module.go +++ b/x/vpn/app_module.go @@ -30,7 +30,6 @@ import ( v2subscriptiontypes "github.com/sentinel-official/hub/v12/x/subscription/types/v2" v3subscriptiontypes "github.com/sentinel-official/hub/v12/x/subscription/types/v3" "github.com/sentinel-official/hub/v12/x/vpn/client/cli" - "github.com/sentinel-official/hub/v12/x/vpn/expected" "github.com/sentinel-official/hub/v12/x/vpn/keeper" "github.com/sentinel-official/hub/v12/x/vpn/migrations" "github.com/sentinel-official/hub/v12/x/vpn/services" @@ -102,12 +101,12 @@ func (amb AppModuleBasic) ValidateGenesis(jsonCodec codec.JSONCodec, _ client.Tx type AppModule struct { AppModuleBasic cdc codec.Codec - account expected.AccountKeeper - bank expected.BankKeeper + account keeper.AccountKeeper + bank keeper.BankKeeper keeper keeper.Keeper } -func NewAppModule(cdc codec.Codec, account expected.AccountKeeper, bank expected.BankKeeper, k keeper.Keeper) AppModule { +func NewAppModule(cdc codec.Codec, account keeper.AccountKeeper, bank keeper.BankKeeper, k keeper.Keeper) AppModule { return AppModule{ cdc: cdc, account: account, diff --git a/x/vpn/expected/keeper.go b/x/vpn/keeper/expected.go similarity index 98% rename from x/vpn/expected/keeper.go rename to x/vpn/keeper/expected.go index 09610b004..fc06328d4 100644 --- a/x/vpn/expected/keeper.go +++ b/x/vpn/keeper/expected.go @@ -1,4 +1,4 @@ -package expected +package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/vpn/keeper/keeper.go b/x/vpn/keeper/keeper.go index a35480b9e..fa475dc5b 100644 --- a/x/vpn/keeper/keeper.go +++ b/x/vpn/keeper/keeper.go @@ -12,7 +12,6 @@ import ( providerkeeper "github.com/sentinel-official/hub/v12/x/provider/keeper" sessionkeeper "github.com/sentinel-official/hub/v12/x/session/keeper" subscriptionkeeper "github.com/sentinel-official/hub/v12/x/subscription/keeper" - "github.com/sentinel-official/hub/v12/x/vpn/expected" ) type Keeper struct { @@ -26,8 +25,8 @@ type Keeper struct { } func NewKeeper( - cdc codec.BinaryCodec, key storetypes.StoreKey, accountKeeper expected.AccountKeeper, - bankKeeper expected.BankKeeper, distributionKeeper expected.DistributionKeeper, oracleKeeper expected.OracleKeeper, + cdc codec.BinaryCodec, key storetypes.StoreKey, accountKeeper AccountKeeper, + bankKeeper BankKeeper, distributionKeeper DistributionKeeper, oracleKeeper OracleKeeper, router *baseapp.MsgServiceRouter, authority, feeCollectorName string, ) Keeper { k := Keeper{