Skip to content

Commit 8cff93c

Browse files
ironman0x7b2ironman0x7b2
committed
chore: add alias methods
1 parent b165c4f commit 8cff93c

File tree

17 files changed

+274
-55
lines changed

17 files changed

+274
-55
lines changed

‎x/deposit/keeper/alias.go‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package keeper
2+
3+
import (
4+
sdk "github.com/cosmos/cosmos-sdk/types"
5+
)
6+
7+
func (k *Keeper) SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error {
8+
return k.bank.SendCoinsFromAccountToModule(ctx, senderAddr, recipientModule, amt)
9+
}
10+
11+
func (k *Keeper) SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error {
12+
return k.bank.SendCoinsFromModuleToAccount(ctx, senderModule, recipientAddr, amt)
13+
}
14+
15+
func (k *Keeper) SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error {
16+
return k.bank.SendCoinsFromModuleToModule(ctx, senderModule, recipientModule, amt)
17+
}

‎x/deposit/keeper/deposit.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (k *Keeper) IterateDeposits(ctx sdk.Context, fn func(index int, item v1.Dep
7171
// If the deposit does not exist, a new deposit will be created.
7272
// It returns an error if the account doesn't have enough balance.
7373
func (k *Keeper) SendCoinsFromAccountToDeposit(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, coins sdk.Coins) error {
74-
if err := k.bank.SendCoinsFromAccountToModule(ctx, fromAddr, types.ModuleName, coins); err != nil {
74+
if err := k.SendCoinsFromAccountToModule(ctx, fromAddr, types.ModuleName, coins); err != nil {
7575
return err
7676
}
7777

@@ -112,7 +112,7 @@ func (k *Keeper) SendCoinsFromDepositToAccount(ctx sdk.Context, fromAddr, toAddr
112112
return types.NewErrorInsufficientDeposit(fromAddr)
113113
}
114114

115-
if err := k.bank.SendCoinsFromModuleToAccount(ctx, types.ModuleName, toAddr, coins); err != nil {
115+
if err := k.SendCoinsFromModuleToAccount(ctx, types.ModuleName, toAddr, coins); err != nil {
116116
return err
117117
}
118118

@@ -140,7 +140,7 @@ func (k *Keeper) SendCoinsFromDepositToModule(ctx sdk.Context, fromAddr sdk.AccA
140140
return types.NewErrorInsufficientDeposit(fromAddr)
141141
}
142142

143-
if err := k.bank.SendCoinsFromModuleToModule(ctx, types.ModuleName, toModule, coins); err != nil {
143+
if err := k.SendCoinsFromModuleToModule(ctx, types.ModuleName, toModule, coins); err != nil {
144144
return err
145145
}
146146

‎x/lease/keeper/alias.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ package keeper
22

33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
5+
6+
base "github.com/sentinel-official/hub/v12/types"
7+
nodetypes "github.com/sentinel-official/hub/v12/x/node/types/v2"
8+
providertypes "github.com/sentinel-official/hub/v12/x/provider/types/v2"
59
)
610

711
func (k *Keeper) AddDeposit(ctx sdk.Context, addr sdk.AccAddress, coin sdk.Coin) error {
@@ -36,6 +40,14 @@ func (k *Keeper) SendCoinFromDepositToModule(ctx sdk.Context, fromAddr sdk.AccAd
3640
return k.deposit.SendCoinsFromDepositToModule(ctx, fromAddr, toModule, sdk.NewCoins(coin))
3741
}
3842

43+
func (k *Keeper) GetNode(ctx sdk.Context, addr base.NodeAddress) (nodetypes.Node, bool) {
44+
return k.node.GetNode(ctx, addr)
45+
}
46+
47+
func (k *Keeper) GetProvider(ctx sdk.Context, addr base.ProvAddress) (providertypes.Provider, bool) {
48+
return k.provider.GetProvider(ctx, addr)
49+
}
50+
3951
func (k *Keeper) LeaseInactivePreHook(ctx sdk.Context, id uint64) error {
4052
if err := k.plan.LeaseInactivePreHook(ctx, id); err != nil {
4153
return err

‎x/lease/keeper/msg_handler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (k *Keeper) HandleMsgRenewLease(ctx sdk.Context, msg *v1.MsgRenewLeaseReque
8181
return nil, err
8282
}
8383

84-
provider, found := k.provider.GetProvider(ctx, provAddr)
84+
provider, found := k.GetProvider(ctx, provAddr)
8585
if !found {
8686
return nil, types.NewErrorProviderNotFound(provAddr)
8787
}
@@ -94,7 +94,7 @@ func (k *Keeper) HandleMsgRenewLease(ctx sdk.Context, msg *v1.MsgRenewLeaseReque
9494
return nil, err
9595
}
9696

97-
node, found := k.node.GetNode(ctx, nodeAddr)
97+
node, found := k.GetNode(ctx, nodeAddr)
9898
if !found {
9999
return nil, types.NewErrorNodeNotFound(nodeAddr)
100100
}
@@ -171,7 +171,7 @@ func (k *Keeper) HandleMsgStartLease(ctx sdk.Context, msg *v1.MsgStartLeaseReque
171171
return nil, err
172172
}
173173

174-
provider, found := k.provider.GetProvider(ctx, provAddr)
174+
provider, found := k.GetProvider(ctx, provAddr)
175175
if !found {
176176
return nil, types.NewErrorProviderNotFound(provAddr)
177177
}
@@ -184,7 +184,7 @@ func (k *Keeper) HandleMsgStartLease(ctx sdk.Context, msg *v1.MsgStartLeaseReque
184184
return nil, err
185185
}
186186

187-
node, found := k.node.GetNode(ctx, nodeAddr)
187+
node, found := k.GetNode(ctx, nodeAddr)
188188
if !found {
189189
return nil, types.NewErrorNodeNotFound(nodeAddr)
190190
}

‎x/mint/keeper/abci.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) []abcitypes.ValidatorUpdate {
1313
return true
1414
}
1515

16-
params := k.mint.GetParams(ctx)
16+
params := k.GetParams(ctx)
1717
params.InflationMax = item.Max
1818
params.InflationMin = item.Min
1919
params.InflationRateChange = item.RateChange
20-
if err := k.mint.SetParams(ctx, params); err != nil {
20+
if err := k.SetParams(ctx, params); err != nil {
2121
panic(err)
2222
}
2323

24-
minter := k.mint.GetMinter(ctx)
24+
minter := k.GetMinter(ctx)
2525
minter.Inflation = item.Min
26-
k.mint.SetMinter(ctx, minter)
26+
k.SetMinter(ctx, minter)
2727

2828
k.DeleteInflation(ctx, item.Timestamp)
2929
return false

‎x/mint/keeper/alias.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package keeper
2+
3+
import (
4+
sdk "github.com/cosmos/cosmos-sdk/types"
5+
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
6+
)
7+
8+
func (k *Keeper) GetMinter(ctx sdk.Context) minttypes.Minter {
9+
return k.mint.GetMinter(ctx)
10+
}
11+
12+
func (k *Keeper) SetMinter(ctx sdk.Context, minter minttypes.Minter) {
13+
k.mint.SetMinter(ctx, minter)
14+
}
15+
16+
func (k *Keeper) GetParams(ctx sdk.Context) minttypes.Params {
17+
return k.mint.GetParams(ctx)
18+
}
19+
20+
func (k *Keeper) SetParams(ctx sdk.Context, params minttypes.Params) error {
21+
return k.mint.SetParams(ctx, params)
22+
}

‎x/node/keeper/alias.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package keeper
22

33
import (
4+
"time"
5+
46
sdk "github.com/cosmos/cosmos-sdk/types"
57

68
base "github.com/sentinel-official/hub/v12/types"
9+
sessiontypes "github.com/sentinel-official/hub/v12/x/session/types/v3"
710
)
811

912
func (k *Keeper) FundCommunityPool(ctx sdk.Context, fromAddr sdk.AccAddress, coin sdk.Coin) error {
@@ -46,6 +49,50 @@ func (k *Keeper) SubtractDeposit(ctx sdk.Context, addr sdk.AccAddress, coin sdk.
4649
return k.deposit.SubtractDeposit(ctx, addr, sdk.NewCoins(coin))
4750
}
4851

52+
func (k *Keeper) DeleteSession(ctx sdk.Context, id uint64) {
53+
k.session.DeleteSession(ctx, id)
54+
}
55+
56+
func (k *Keeper) DeleteSessionForAccount(ctx sdk.Context, addr sdk.AccAddress, id uint64) {
57+
k.session.DeleteSessionForAccount(ctx, addr, id)
58+
}
59+
60+
func (k *Keeper) DeleteSessionForNode(ctx sdk.Context, addr base.NodeAddress, id uint64) {
61+
k.session.DeleteSessionForNode(ctx, addr, id)
62+
}
63+
64+
func (k *Keeper) GetSessionCount(ctx sdk.Context) uint64 {
65+
return k.session.GetCount(ctx)
66+
}
67+
68+
func (k *Keeper) GetSession(ctx sdk.Context, id uint64) (sessiontypes.Session, bool) {
69+
return k.session.GetSession(ctx, id)
70+
}
71+
72+
func (k *Keeper) SetSessionCount(ctx sdk.Context, count uint64) {
73+
k.session.SetCount(ctx, count)
74+
}
75+
76+
func (k *Keeper) SetSession(ctx sdk.Context, session sessiontypes.Session) {
77+
k.session.SetSession(ctx, session)
78+
}
79+
80+
func (k *Keeper) SetSessionForAccount(ctx sdk.Context, addr sdk.AccAddress, id uint64) {
81+
k.session.SetSessionForAccount(ctx, addr, id)
82+
}
83+
84+
func (k *Keeper) SetSessionForInactiveAt(ctx sdk.Context, at time.Time, id uint64) {
85+
k.session.SetSessionForInactiveAt(ctx, at, id)
86+
}
87+
88+
func (k *Keeper) SetSessionForNode(ctx sdk.Context, addr base.NodeAddress, id uint64) {
89+
k.session.SetSessionForNode(ctx, addr, id)
90+
}
91+
92+
func (k *Keeper) SessionStatusChangeDelay(ctx sdk.Context) time.Duration {
93+
return k.session.StatusChangeDelay(ctx)
94+
}
95+
4996
func (k *Keeper) NodeInactivePreHook(ctx sdk.Context, addr base.NodeAddress) error {
5097
if err := k.lease.NodeInactivePreHook(ctx, addr); err != nil {
5198
return err

‎x/node/keeper/hooks.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
func (k *Keeper) HandleInactiveSession(ctx sdk.Context, id uint64) error {
15-
item, found := k.session.GetSession(ctx, id)
15+
item, found := k.GetSession(ctx, id)
1616
if !found {
1717
return fmt.Errorf("session %d does not exist", id)
1818
}
@@ -71,9 +71,9 @@ func (k *Keeper) HandleInactiveSession(ctx sdk.Context, id uint64) error {
7171
},
7272
)
7373

74-
k.session.DeleteSession(ctx, item.GetID())
75-
k.session.DeleteSessionForAccount(ctx, accAddr, item.GetID())
76-
k.session.DeleteSessionForNode(ctx, nodeAddr, item.GetID())
74+
k.DeleteSession(ctx, item.GetID())
75+
k.DeleteSessionForAccount(ctx, accAddr, item.GetID())
76+
k.DeleteSessionForNode(ctx, nodeAddr, item.GetID())
7777

7878
return nil
7979
}

‎x/node/keeper/msg_handler.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ func (k *Keeper) HandleMsgStartSession(ctx sdk.Context, msg *v3.MsgStartSessionR
189189
}
190190

191191
var (
192-
count = k.session.GetCount(ctx)
193-
delay = k.session.StatusChangeDelay(ctx)
192+
count = k.GetSessionCount(ctx)
193+
delay = k.SessionStatusChangeDelay(ctx)
194194
session = &v3.Session{
195195
ID: count + 1,
196196
AccAddress: accAddr.String(),
@@ -225,11 +225,11 @@ func (k *Keeper) HandleMsgStartSession(ctx sdk.Context, msg *v3.MsgStartSessionR
225225
return nil, err
226226
}
227227

228-
k.session.SetCount(ctx, count+1)
229-
k.session.SetSession(ctx, session)
230-
k.session.SetSessionForAccount(ctx, accAddr, session.ID)
231-
k.session.SetSessionForNode(ctx, nodeAddr, session.ID)
232-
k.session.SetSessionForInactiveAt(ctx, session.InactiveAt, session.ID)
228+
k.SetSessionCount(ctx, count+1)
229+
k.SetSession(ctx, session)
230+
k.SetSessionForAccount(ctx, accAddr, session.ID)
231+
k.SetSessionForNode(ctx, nodeAddr, session.ID)
232+
k.SetSessionForInactiveAt(ctx, session.InactiveAt, session.ID)
233233

234234
ctx.EventManager().EmitTypedEvent(
235235
&v3.EventCreateSession{

‎x/plan/keeper/alias.go‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,42 @@ import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

66
base "github.com/sentinel-official/hub/v12/types"
7+
leasetypes "github.com/sentinel-official/hub/v12/x/lease/types/v1"
8+
nodetypes "github.com/sentinel-official/hub/v12/x/node/types/v2"
79
)
810

11+
func (k *Keeper) GetLease(ctx sdk.Context, id uint64) (leasetypes.Lease, bool) {
12+
return k.lease.GetLease(ctx, id)
13+
}
14+
15+
func (k *Keeper) IterateLeasesForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress, fn func(index int, item leasetypes.Lease) (stop bool)) {
16+
k.lease.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, fn)
17+
}
18+
19+
func (k *Keeper) GetNode(ctx sdk.Context, addr base.NodeAddress) (nodetypes.Node, bool) {
20+
return k.node.GetNode(ctx, addr)
21+
}
22+
23+
func (k *Keeper) SetNodeForPlan(ctx sdk.Context, id uint64, addr base.NodeAddress) {
24+
k.node.SetNodeForPlan(ctx, id, addr)
25+
}
26+
27+
func (k *Keeper) DeleteNodeForPlan(ctx sdk.Context, id uint64, addr base.NodeAddress) {
28+
k.node.DeleteNodeForPlan(ctx, id, addr)
29+
}
30+
31+
func (k *Keeper) GetNodesForPlan(ctx sdk.Context, id uint64) []nodetypes.Node {
32+
return k.node.GetNodesForPlan(ctx, id)
33+
}
34+
35+
func (k *Keeper) HasNodeForPlan(ctx sdk.Context, id uint64, addr base.NodeAddress) bool {
36+
return k.node.HasNodeForPlan(ctx, id, addr)
37+
}
38+
39+
func (k *Keeper) HasProvider(ctx sdk.Context, addr base.ProvAddress) bool {
40+
return k.provider.HasProvider(ctx, addr)
41+
}
42+
943
func (k *Keeper) PlanUnlinkNodePreHook(ctx sdk.Context, id uint64, addr base.NodeAddress) error {
1044
if err := k.session.PlanUnlinkNodePreHook(ctx, id, addr); err != nil {
1145
return err

0 commit comments

Comments
 (0)