Skip to content

Commit 289c5bc

Browse files
RogerKSIRogerKSI
committed
use staker instead of locker
1 parent 85848f9 commit 289c5bc

19 files changed

+279
-279
lines changed

‎x/restake/client/cli/query.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func GetQueryCmdKey() *cobra.Command {
100100
// GetQueryCmdRewards implements the rewards query command.
101101
func GetQueryCmdRewards() *cobra.Command {
102102
cmd := &cobra.Command{
103-
Use: "rewards [locker_address]",
103+
Use: "rewards [staker_address]",
104104
Short: "shows all rewards of an address",
105105
Args: cobra.ExactArgs(1),
106106
RunE: func(cmd *cobra.Command, args []string) error {
@@ -117,7 +117,7 @@ func GetQueryCmdRewards() *cobra.Command {
117117
}
118118

119119
res, err := queryClient.Rewards(cmd.Context(), &types.QueryRewardsRequest{
120-
LockerAddress: args[0],
120+
StakerAddress: args[0],
121121
Pagination: pageReq,
122122
})
123123
if err != nil {
@@ -137,8 +137,8 @@ func GetQueryCmdRewards() *cobra.Command {
137137
// GetQueryCmdReward implements the reward query command.
138138
func GetQueryCmdReward() *cobra.Command {
139139
cmd := &cobra.Command{
140-
Use: "reward [locker_address] [key_name]",
141-
Short: "shows the reward of an locker address for the key",
140+
Use: "reward [staker_address] [key_name]",
141+
Short: "shows the reward of an staker address for the key",
142142
Args: cobra.ExactArgs(2),
143143
RunE: func(cmd *cobra.Command, args []string) error {
144144
clientCtx, err := client.GetClientQueryContext(cmd)
@@ -149,7 +149,7 @@ func GetQueryCmdReward() *cobra.Command {
149149
queryClient := types.NewQueryClient(clientCtx)
150150

151151
res, err := queryClient.Reward(cmd.Context(), &types.QueryRewardRequest{
152-
LockerAddress: args[0],
152+
StakerAddress: args[0],
153153
Key: args[1],
154154
})
155155
if err != nil {
@@ -168,8 +168,8 @@ func GetQueryCmdReward() *cobra.Command {
168168
// GetQueryCmdLocks implements the locks query command.
169169
func GetQueryCmdLocks() *cobra.Command {
170170
cmd := &cobra.Command{
171-
Use: "locks [locker_address]",
172-
Short: "shows all locks of an locker address",
171+
Use: "locks [staker_address]",
172+
Short: "shows all locks of an staker address",
173173
Args: cobra.ExactArgs(1),
174174
RunE: func(cmd *cobra.Command, args []string) error {
175175
clientCtx, err := client.GetClientQueryContext(cmd)
@@ -185,7 +185,7 @@ func GetQueryCmdLocks() *cobra.Command {
185185
}
186186

187187
res, err := queryClient.Locks(cmd.Context(), &types.QueryLocksRequest{
188-
LockerAddress: args[0],
188+
StakerAddress: args[0],
189189
Pagination: pageReq,
190190
})
191191
if err != nil {
@@ -205,8 +205,8 @@ func GetQueryCmdLocks() *cobra.Command {
205205
// GetQueryCmdLock implements the lock query command.
206206
func GetQueryCmdLock() *cobra.Command {
207207
cmd := &cobra.Command{
208-
Use: "lock [locker_address] [key_name]",
209-
Short: "shows the lock of an locker address for the key",
208+
Use: "lock [staker_address] [key_name]",
209+
Short: "shows the lock of an staker address for the key",
210210
Args: cobra.ExactArgs(2),
211211
RunE: func(cmd *cobra.Command, args []string) error {
212212
clientCtx, err := client.GetClientQueryContext(cmd)
@@ -217,7 +217,7 @@ func GetQueryCmdLock() *cobra.Command {
217217
queryClient := types.NewQueryClient(clientCtx)
218218

219219
res, err := queryClient.Lock(cmd.Context(), &types.QueryLockRequest{
220-
LockerAddress: args[0],
220+
StakerAddress: args[0],
221221
Key: args[1],
222222
})
223223
if err != nil {

‎x/restake/client/cli/tx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func GetTxCmdClaimRewards() *cobra.Command {
5353
pageSize := uint64(1000)
5454
for {
5555
respRewards, err := queryClient.Rewards(context.Background(), &types.QueryRewardsRequest{
56-
LockerAddress: clientCtx.GetFromAddress().String(),
56+
StakerAddress: clientCtx.GetFromAddress().String(),
5757
Pagination: &query.PageRequest{
5858
Offset: offset,
5959
Limit: pageSize,

‎x/restake/keeper/grpc_query.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (k Querier) Rewards(
6666
) (*types.QueryRewardsResponse, error) {
6767
ctx := sdk.UnwrapSDKContext(c)
6868

69-
addr, err := sdk.AccAddressFromBech32(req.LockerAddress)
69+
addr, err := sdk.AccAddressFromBech32(req.StakerAddress)
7070
if err != nil {
7171
return nil, err
7272
}
@@ -97,7 +97,7 @@ func (k Querier) Reward(
9797
) (*types.QueryRewardResponse, error) {
9898
ctx := sdk.UnwrapSDKContext(c)
9999

100-
addr, err := sdk.AccAddressFromBech32(req.LockerAddress)
100+
addr, err := sdk.AccAddressFromBech32(req.StakerAddress)
101101
if err != nil {
102102
return nil, err
103103
}
@@ -119,7 +119,7 @@ func (k Querier) Locks(
119119
) (*types.QueryLocksResponse, error) {
120120
ctx := sdk.UnwrapSDKContext(c)
121121

122-
addr, err := sdk.AccAddressFromBech32(req.LockerAddress)
122+
addr, err := sdk.AccAddressFromBech32(req.StakerAddress)
123123
if err != nil {
124124
return nil, err
125125
}
@@ -156,7 +156,7 @@ func (k Querier) Lock(
156156
) (*types.QueryLockResponse, error) {
157157
ctx := sdk.UnwrapSDKContext(c)
158158

159-
addr, err := sdk.AccAddressFromBech32(req.LockerAddress)
159+
addr, err := sdk.AccAddressFromBech32(req.StakerAddress)
160160
if err != nil {
161161
return nil, err
162162
}

‎x/restake/keeper/grpc_query_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
111111
"rewards of address1 - lock on multiple keys",
112112
func() {
113113
req = &types.QueryRewardsRequest{
114-
LockerAddress: ValidAddress1.String(),
114+
StakerAddress: ValidAddress1.String(),
115115
}
116116
expRes = &types.QueryRewardsResponse{
117117
Rewards: []*types.Reward{
@@ -136,7 +136,7 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
136136
"rewards of address2 - lock on one key",
137137
func() {
138138
req = &types.QueryRewardsRequest{
139-
LockerAddress: ValidAddress2.String(),
139+
StakerAddress: ValidAddress2.String(),
140140
}
141141
expRes = &types.QueryRewardsResponse{
142142
Rewards: []*types.Reward{
@@ -153,7 +153,7 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
153153
"rewards of address3 - no lock",
154154
func() {
155155
req = &types.QueryRewardsRequest{
156-
LockerAddress: ValidAddress3.String(),
156+
StakerAddress: ValidAddress3.String(),
157157
}
158158
expRes = &types.QueryRewardsResponse{
159159
Rewards: []*types.Reward(nil),
@@ -199,7 +199,7 @@ func (suite *KeeperTestSuite) TestQueryReward() {
199199
"reward of address1 on KeyWithRewards",
200200
func() {
201201
req = &types.QueryRewardRequest{
202-
LockerAddress: ValidAddress1.String(),
202+
StakerAddress: ValidAddress1.String(),
203203
Key: KeyWithRewards,
204204
}
205205
expRes = &types.QueryRewardResponse{
@@ -215,7 +215,7 @@ func (suite *KeeperTestSuite) TestQueryReward() {
215215
"reward of address1 on InactiveKey",
216216
func() {
217217
req = &types.QueryRewardRequest{
218-
LockerAddress: ValidAddress1.String(),
218+
StakerAddress: ValidAddress1.String(),
219219
Key: InactiveKey,
220220
}
221221
expRes = &types.QueryRewardResponse{
@@ -231,7 +231,7 @@ func (suite *KeeperTestSuite) TestQueryReward() {
231231
"reward of address2 on KeyWithRewards",
232232
func() {
233233
req = &types.QueryRewardRequest{
234-
LockerAddress: ValidAddress2.String(),
234+
StakerAddress: ValidAddress2.String(),
235235
Key: KeyWithRewards,
236236
}
237237
expRes = &types.QueryRewardResponse{
@@ -281,7 +281,7 @@ func (suite *KeeperTestSuite) TestQueryLocks() {
281281
"locks of address1 - lock on multiple keys",
282282
func() {
283283
req = &types.QueryLocksRequest{
284-
LockerAddress: ValidAddress1.String(),
284+
StakerAddress: ValidAddress1.String(),
285285
}
286286
expRes = &types.QueryLocksResponse{
287287
Locks: []*types.LockResponse{
@@ -302,7 +302,7 @@ func (suite *KeeperTestSuite) TestQueryLocks() {
302302
"locks of address2 - lock on one key",
303303
func() {
304304
req = &types.QueryLocksRequest{
305-
LockerAddress: ValidAddress2.String(),
305+
StakerAddress: ValidAddress2.String(),
306306
}
307307
expRes = &types.QueryLocksResponse{
308308
Locks: []*types.LockResponse{
@@ -319,7 +319,7 @@ func (suite *KeeperTestSuite) TestQueryLocks() {
319319
"locks of address3 - no lock",
320320
func() {
321321
req = &types.QueryLocksRequest{
322-
LockerAddress: ValidAddress3.String(),
322+
StakerAddress: ValidAddress3.String(),
323323
}
324324
expRes = &types.QueryLocksResponse{
325325
Locks: []*types.LockResponse(nil),
@@ -365,7 +365,7 @@ func (suite *KeeperTestSuite) TestQueryLock() {
365365
"lock of address1 on KeyWithRewards",
366366
func() {
367367
req = &types.QueryLockRequest{
368-
LockerAddress: ValidAddress1.String(),
368+
StakerAddress: ValidAddress1.String(),
369369
Key: KeyWithRewards,
370370
}
371371
expRes = &types.QueryLockResponse{
@@ -381,7 +381,7 @@ func (suite *KeeperTestSuite) TestQueryLock() {
381381
"lock of address1 on InactiveKey",
382382
func() {
383383
req = &types.QueryLockRequest{
384-
LockerAddress: ValidAddress1.String(),
384+
StakerAddress: ValidAddress1.String(),
385385
Key: InactiveKey,
386386
}
387387
expRes = nil
@@ -392,7 +392,7 @@ func (suite *KeeperTestSuite) TestQueryLock() {
392392
"lock of address2 on KeyWithRewards",
393393
func() {
394394
req = &types.QueryLockRequest{
395-
LockerAddress: ValidAddress2.String(),
395+
StakerAddress: ValidAddress2.String(),
396396
Key: KeyWithRewards,
397397
}
398398
expRes = &types.QueryLockResponse{

‎x/restake/keeper/keeper_lock.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99

1010
// SetLockedPower sets the new locked power amount of the address to the key
1111
// This function will override the previous locked amount.
12-
func (k Keeper) SetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyName string, amount sdkmath.Int) error {
12+
func (k Keeper) SetLockedPower(ctx sdk.Context, stakerAddr sdk.AccAddress, keyName string, amount sdkmath.Int) error {
1313
if !amount.IsUint64() {
1414
return types.ErrInvalidAmount
1515
}
1616

1717
// check if delegation is not less than amount
18-
delegation := k.stakingKeeper.GetDelegatorBonded(ctx, lockerAddr)
18+
delegation := k.stakingKeeper.GetDelegatorBonded(ctx, stakerAddr)
1919
if delegation.LT(amount) {
2020
return types.ErrDelegationNotEnough
2121
}
@@ -30,10 +30,10 @@ func (k Keeper) SetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyNa
3030
}
3131

3232
// check if there is a lock before
33-
lock, err := k.GetLock(ctx, lockerAddr, keyName)
33+
lock, err := k.GetLock(ctx, stakerAddr, keyName)
3434
if err != nil {
3535
lock = types.Lock{
36-
LockerAddress: lockerAddr.String(),
36+
StakerAddress: stakerAddr.String(),
3737
Key: keyName,
3838
Amount: sdkmath.NewInt(0),
3939
PosRewardDebts: sdk.NewDecCoins(),
@@ -58,7 +58,7 @@ func (k Keeper) SetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyNa
5858
ctx.EventManager().EmitEvent(
5959
sdk.NewEvent(
6060
types.EventTypeLockPower,
61-
sdk.NewAttribute(types.AttributeKeyLocker, lockerAddr.String()),
61+
sdk.NewAttribute(types.AttributeKeyStaker, stakerAddr.String()),
6262
sdk.NewAttribute(types.AttributeKeyKey, keyName),
6363
sdk.NewAttribute(sdk.AttributeKeyAmount, amount.String()),
6464
),
@@ -68,7 +68,7 @@ func (k Keeper) SetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyNa
6868
}
6969

7070
// GetLockedPower returns locked power of the address to the key.
71-
func (k Keeper) GetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyName string) (sdkmath.Int, error) {
71+
func (k Keeper) GetLockedPower(ctx sdk.Context, stakerAddr sdk.AccAddress, keyName string) (sdkmath.Int, error) {
7272
key, err := k.GetKey(ctx, keyName)
7373
if err != nil {
7474
return sdkmath.Int{}, types.ErrKeyNotFound
@@ -78,7 +78,7 @@ func (k Keeper) GetLockedPower(ctx sdk.Context, lockerAddr sdk.AccAddress, keyNa
7878
return sdkmath.Int{}, types.ErrKeyNotActive
7979
}
8080

81-
lock, err := k.GetLock(ctx, lockerAddr, keyName)
81+
lock, err := k.GetLock(ctx, stakerAddr, keyName)
8282
if err != nil {
8383
return sdkmath.Int{}, types.ErrLockNotFound
8484
}
@@ -169,7 +169,7 @@ func (k Keeper) GetLock(ctx sdk.Context, addr sdk.AccAddress, keyName string) (t
169169

170170
// SetLock sets a lock to the store.
171171
func (k Keeper) SetLock(ctx sdk.Context, lock types.Lock) {
172-
addr := sdk.MustAccAddressFromBech32(lock.LockerAddress)
172+
addr := sdk.MustAccAddressFromBech32(lock.StakerAddress)
173173
k.DeleteLock(ctx, addr, lock.Key)
174174

175175
ctx.KVStore(k.storeKey).Set(types.LockStoreKey(addr, lock.Key), k.cdc.MustMarshal(&lock))

‎x/restake/keeper/keeper_lock_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
5555
},
5656
sdkmath.NewInt(200),
5757
types.Lock{
58-
LockerAddress: ValidAddress1.String(),
58+
StakerAddress: ValidAddress1.String(),
5959
Key: KeyWithRewards,
6060
Amount: sdkmath.NewInt(100),
6161
PosRewardDebts: nil,
@@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
7575
}
7676

7777
preLock = &types.Lock{
78-
LockerAddress: ValidAddress1.String(),
78+
StakerAddress: ValidAddress1.String(),
7979
Key: KeyWithRewards,
8080
Amount: sdkmath.NewInt(10),
8181
PosRewardDebts: nil,
@@ -86,7 +86,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
8686
},
8787
sdkmath.NewInt(190),
8888
types.Lock{
89-
LockerAddress: ValidAddress1.String(),
89+
StakerAddress: ValidAddress1.String(),
9090
Key: KeyWithRewards,
9191
Amount: sdkmath.NewInt(100),
9292
PosRewardDebts: nil,
@@ -114,7 +114,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
114114
},
115115
sdkmath.NewInt(200),
116116
types.Lock{
117-
LockerAddress: ValidAddress1.String(),
117+
StakerAddress: ValidAddress1.String(),
118118
Key: KeyWithRewards,
119119
Amount: sdkmath.NewInt(100),
120120
PosRewardDebts: sdk.NewDecCoins(
@@ -140,7 +140,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
140140
}
141141

142142
preLock = &types.Lock{
143-
LockerAddress: ValidAddress1.String(),
143+
StakerAddress: ValidAddress1.String(),
144144
Key: KeyWithRewards,
145145
Amount: sdkmath.NewInt(100),
146146
PosRewardDebts: nil,
@@ -151,7 +151,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
151151
},
152152
sdkmath.NewInt(1000),
153153
types.Lock{
154-
LockerAddress: ValidAddress1.String(),
154+
StakerAddress: ValidAddress1.String(),
155155
Key: KeyWithRewards,
156156
Amount: sdkmath.NewInt(1000),
157157
PosRewardDebts: sdk.NewDecCoins(
@@ -177,7 +177,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
177177
}
178178

179179
preLock = &types.Lock{
180-
LockerAddress: ValidAddress1.String(),
180+
StakerAddress: ValidAddress1.String(),
181181
Key: KeyWithRewards,
182182
Amount: sdkmath.NewInt(1000),
183183
PosRewardDebts: nil,
@@ -188,7 +188,7 @@ func (suite *KeeperTestSuite) TestSetLockedPower() {
188188
},
189189
sdkmath.NewInt(100),
190190
types.Lock{
191-
LockerAddress: ValidAddress1.String(),
191+
StakerAddress: ValidAddress1.String(),
192192
Key: KeyWithRewards,
193193
Amount: sdkmath.NewInt(100),
194194
PosRewardDebts: nil,
@@ -259,7 +259,7 @@ func (suite *KeeperTestSuite) TestGetSetLock() {
259259
// set
260260
expectedLocks := suite.validLocks
261261
for _, expLock := range expectedLocks {
262-
acc := sdk.MustAccAddressFromBech32(expLock.LockerAddress)
262+
acc := sdk.MustAccAddressFromBech32(expLock.StakerAddress)
263263
suite.restakeKeeper.SetLock(ctx, expLock)
264264

265265
// has
@@ -295,7 +295,7 @@ func (suite *KeeperTestSuite) TestGetSetLock() {
295295

296296
// delete
297297
for _, expLock := range expectedLocks {
298-
acc := sdk.MustAccAddressFromBech32(expLock.LockerAddress)
298+
acc := sdk.MustAccAddressFromBech32(expLock.StakerAddress)
299299
suite.restakeKeeper.DeleteLock(ctx, acc, expLock.Key)
300300

301301
// has

0 commit comments

Comments
 (0)