chore: moved expected package to keeper

sentinel-official · Feb 13, 2025 · e2a815d · e2a815d
1 parent 3b4974f
commit e2a815d
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 89 deletions.
diff --git a/x/deposit/expected/keeper.go → x/deposit/keeper/expected.go b/x/deposit/expected/keeper.go → 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
@@ -9,15 +9,14 @@ 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"
 )
 
 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 → x/lease/keeper/expected.go b/x/lease/expected/keeper.go → 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
@@ -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 → x/mint/keeper/expected.go b/x/mint/expected/keeper.go → 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
@@ -6,18 +6,17 @@ 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"
 )
 
 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 → x/node/keeper/expected.go b/x/node/expected/keeper.go → 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
@@ -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 → x/plan/keeper/expected.go b/x/plan/expected/keeper.go → 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
@@ -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 → x/provider/keeper/expected.go b/x/provider/expected/keeper.go → 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
@@ -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 → x/session/keeper/expected.go b/x/session/expected/keeper.go → 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
@@ -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 → x/subscription/keeper/expected.go b/x/subscription/expected/keeper.go → x/subscription/keeper/expected.go
@@ -1,4 +1,4 @@
-package expected
+package keeper
 
 import (
 	"time"