Skip to content

Commit d336ef6

Browse files
RogerKSIRogerKSI
committed
cleanup test
1 parent 8ab00b4 commit d336ef6

File tree

6 files changed

+43
-116
lines changed

6 files changed

+43
-116
lines changed

‎x/restake/keeper/genesis_test.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ import (
66

77
func (suite *KeeperTestSuite) TestExportGenesis() {
88
ctx := suite.ctx
9-
10-
for _, key := range suite.validKeys {
11-
suite.restakeKeeper.SetKey(ctx, key)
12-
}
13-
14-
for _, lock := range suite.validLocks {
15-
suite.restakeKeeper.SetLock(ctx, lock)
16-
}
9+
suite.setupState()
1710

1811
exportGenesis := suite.restakeKeeper.ExportGenesis(ctx)
1912

‎x/restake/keeper/grpc_query_test.go‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,39 +73,28 @@ func (suite *KeeperTestSuite) TestQueryKeys() {
7373
}
7474

7575
func (suite *KeeperTestSuite) TestQueryKey() {
76-
ctx, queryClient := suite.ctx, suite.queryClient
77-
78-
// setup
79-
for _, key := range suite.validKeys {
80-
suite.restakeKeeper.SetKey(ctx, key)
81-
}
76+
queryClient := suite.queryClient
77+
suite.setupState()
8278

8379
// query and check
8480
res, err := queryClient.Key(context.Background(), &types.QueryKeyRequest{
85-
Key: "Key0",
81+
Key: ValidKey1,
8682
})
8783
suite.Require().NoError(err)
8884
suite.Require().Equal(&types.QueryKeyResponse{
8985
Key: suite.validKeys[0],
9086
}, res)
9187

9288
res, err = queryClient.Key(context.Background(), &types.QueryKeyRequest{
93-
Key: "nonKey",
89+
Key: InvalidKey,
9490
})
9591
suite.Require().ErrorContains(err, "key not found")
9692
suite.Require().Nil(res)
9793
}
9894

9995
func (suite *KeeperTestSuite) TestQueryRewards() {
100-
ctx, queryClient := suite.ctx, suite.queryClient
101-
102-
// setup
103-
for _, key := range suite.validKeys {
104-
suite.restakeKeeper.SetKey(ctx, key)
105-
}
106-
for _, lock := range suite.validLocks {
107-
suite.restakeKeeper.SetLock(ctx, lock)
108-
}
96+
queryClient := suite.queryClient
97+
suite.setupState()
10998

11099
// query and check
111100
var (
@@ -127,11 +116,11 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
127116
expRes = &types.QueryRewardsResponse{
128117
Rewards: []*types.Reward{
129118
{
130-
Key: "Key0",
119+
Key: ValidKey1,
131120
Rewards: sdk.NewDecCoins(sdk.NewDecCoin("uband", sdkmath.NewInt(1))),
132121
},
133122
{
134-
Key: "Key1",
123+
Key: ValidKey2,
135124
Rewards: nil,
136125
},
137126
},
@@ -148,7 +137,7 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
148137
expRes = &types.QueryRewardsResponse{
149138
Rewards: []*types.Reward{
150139
{
151-
Key: "Key0",
140+
Key: ValidKey1,
152141
Rewards: sdk.NewDecCoins(sdk.NewDecCoin("uband", sdkmath.NewInt(1))),
153142
},
154143
},
@@ -188,15 +177,8 @@ func (suite *KeeperTestSuite) TestQueryRewards() {
188177
}
189178

190179
func (suite *KeeperTestSuite) TestQueryLocks() {
191-
ctx, queryClient := suite.ctx, suite.queryClient
192-
193-
// setup
194-
for _, key := range suite.validKeys {
195-
suite.restakeKeeper.SetKey(ctx, key)
196-
}
197-
for _, lock := range suite.validLocks {
198-
suite.restakeKeeper.SetLock(ctx, lock)
199-
}
180+
queryClient := suite.queryClient
181+
suite.setupState()
200182

201183
// query and check
202184
var (
@@ -218,11 +200,11 @@ func (suite *KeeperTestSuite) TestQueryLocks() {
218200
expRes = &types.QueryLocksResponse{
219201
Locks: []*types.LockResponse{
220202
{
221-
Key: "Key0",
203+
Key: ValidKey1,
222204
Amount: sdkmath.NewInt(10),
223205
},
224206
{
225-
Key: "Key1",
207+
Key: ValidKey2,
226208
Amount: sdkmath.NewInt(100),
227209
},
228210
},
@@ -239,7 +221,7 @@ func (suite *KeeperTestSuite) TestQueryLocks() {
239221
expRes = &types.QueryLocksResponse{
240222
Locks: []*types.LockResponse{
241223
{
242-
Key: "Key0",
224+
Key: ValidKey1,
243225
Amount: sdkmath.NewInt(10),
244226
},
245227
},

‎x/restake/keeper/keeper_key_test.go‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
11
package keeper_test
22

3-
import (
4-
"github.com/bandprotocol/chain/v2/x/restake/types"
5-
sdk "github.com/cosmos/cosmos-sdk/types"
6-
)
7-
83
func (suite *KeeperTestSuite) TestGetSetKey() {
94
ctx := suite.ctx
105

116
// set
12-
expectedKeys := []types.Key{
13-
{
14-
Name: "Key0",
15-
PoolAddress: "address0",
16-
IsActive: true,
17-
TotalPower: sdk.NewInt(0),
18-
RewardPerPowers: nil,
19-
Remainders: nil,
20-
},
21-
{
22-
Name: "Key1",
23-
PoolAddress: "address1",
24-
IsActive: false,
25-
TotalPower: sdk.NewInt(100),
26-
RewardPerPowers: nil,
27-
Remainders: nil,
28-
},
29-
{
30-
Name: "Key2",
31-
PoolAddress: "address2",
32-
IsActive: true,
33-
TotalPower: sdk.NewInt(1000),
34-
RewardPerPowers: nil,
35-
Remainders: nil,
36-
},
37-
}
7+
expectedKeys := suite.validKeys
388
for _, expKey := range expectedKeys {
399
suite.restakeKeeper.SetKey(ctx, expKey)
4010

‎x/restake/keeper/keeper_lock_test.go‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,16 @@
11
package keeper_test
22

33
import (
4-
"github.com/bandprotocol/chain/v2/x/restake/types"
54
sdk "github.com/cosmos/cosmos-sdk/types"
5+
6+
"github.com/bandprotocol/chain/v2/x/restake/types"
67
)
78

89
func (suite *KeeperTestSuite) TestGetSetLock() {
910
ctx := suite.ctx
1011

1112
// set
12-
expectedLocks := []types.Lock{
13-
{
14-
LockerAddress: ValidAddress1.String(),
15-
Key: "key0",
16-
Amount: sdk.NewInt(10),
17-
PosRewardDebts: nil,
18-
NegRewardDebts: nil,
19-
},
20-
{
21-
LockerAddress: ValidAddress1.String(),
22-
Key: "key1",
23-
Amount: sdk.NewInt(20),
24-
PosRewardDebts: nil,
25-
NegRewardDebts: nil,
26-
},
27-
{
28-
LockerAddress: ValidAddress2.String(),
29-
Key: "key0",
30-
Amount: sdk.NewInt(20),
31-
PosRewardDebts: nil,
32-
NegRewardDebts: nil,
33-
},
34-
}
13+
expectedLocks := suite.validLocks
3514
for _, expLock := range expectedLocks {
3615
acc := sdk.MustAccAddressFromBech32(expLock.LockerAddress)
3716
suite.restakeKeeper.SetLock(ctx, expLock)

‎x/restake/keeper/keeper_test.go‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/stretchr/testify/suite"
1515
"go.uber.org/mock/gomock"
1616

17-
app "github.com/bandprotocol/chain/v2/app"
1817
"github.com/bandprotocol/chain/v2/x/restake/keeper"
1918
restaketestutil "github.com/bandprotocol/chain/v2/x/restake/testutil"
2019
"github.com/bandprotocol/chain/v2/x/restake/types"
@@ -24,6 +23,9 @@ var (
2423
ValidAddress1 = sdk.AccAddress("1000000001")
2524
ValidAddress2 = sdk.AccAddress("1000000002")
2625
ValidAddress3 = sdk.AccAddress("1000000003")
26+
ValidKey1 = "key1"
27+
ValidKey2 = "key2"
28+
InvalidKey = "nonKey"
2729
ValidPoolAddress1 = sdk.AccAddress("2000000001")
2830
ValidPoolAddress2 = sdk.AccAddress("2000000002")
2931
)
@@ -50,19 +52,17 @@ func TestKeeperTestSuite(t *testing.T) {
5052
}
5153

5254
func (suite *KeeperTestSuite) SetupTest() {
53-
app.SetBech32AddressPrefixesAndBip44CoinTypeAndSeal(sdk.GetConfig())
54-
5555
suite.validKeys = []types.Key{
5656
{
57-
Name: "Key0",
57+
Name: ValidKey1,
5858
PoolAddress: ValidPoolAddress1.String(),
5959
IsActive: true,
6060
TotalPower: sdk.NewInt(20),
6161
RewardPerPowers: sdk.NewDecCoins(sdk.NewDecCoinFromDec("uband", sdkmath.LegacyNewDecWithPrec(1, 1))),
62-
Remainders: sdk.NewDecCoins(),
62+
Remainders: nil,
6363
},
6464
{
65-
Name: "Key1",
65+
Name: ValidKey2,
6666
PoolAddress: ValidPoolAddress2.String(),
6767
IsActive: true,
6868
TotalPower: sdk.NewInt(100),
@@ -74,21 +74,21 @@ func (suite *KeeperTestSuite) SetupTest() {
7474
suite.validLocks = []types.Lock{
7575
{
7676
LockerAddress: ValidAddress1.String(),
77-
Key: "Key0",
77+
Key: ValidKey1,
7878
Amount: sdk.NewInt(10),
7979
PosRewardDebts: nil,
8080
NegRewardDebts: nil,
8181
},
8282
{
8383
LockerAddress: ValidAddress1.String(),
84-
Key: "Key1",
84+
Key: ValidKey2,
8585
Amount: sdk.NewInt(100),
8686
PosRewardDebts: nil,
8787
NegRewardDebts: nil,
8888
},
8989
{
9090
LockerAddress: ValidAddress2.String(),
91-
Key: "Key0",
91+
Key: ValidKey1,
9292
Amount: sdk.NewInt(10),
9393
PosRewardDebts: nil,
9494
NegRewardDebts: nil,
@@ -136,3 +136,13 @@ func (suite *KeeperTestSuite) SetupTest() {
136136
suite.queryClient = queryClient
137137
suite.msgServer = keeper.NewMsgServerImpl(&suite.restakeKeeper)
138138
}
139+
140+
func (suite *KeeperTestSuite) setupState() {
141+
for _, key := range suite.validKeys {
142+
suite.restakeKeeper.SetKey(suite.ctx, key)
143+
}
144+
145+
for _, lock := range suite.validLocks {
146+
suite.restakeKeeper.SetLock(suite.ctx, lock)
147+
}
148+
}

‎x/restake/keeper/msg_server_test.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@ import (
99

1010
func (suite *KeeperTestSuite) TestMsgClaimRewards() {
1111
ctx := suite.ctx
12-
13-
// setup
14-
for _, key := range suite.validKeys {
15-
suite.restakeKeeper.SetKey(ctx, key)
16-
}
17-
for _, lock := range suite.validLocks {
18-
suite.restakeKeeper.SetLock(ctx, lock)
19-
}
12+
suite.setupState()
2013

2114
testCases := []struct {
2215
name string
@@ -29,7 +22,7 @@ func (suite *KeeperTestSuite) TestMsgClaimRewards() {
2922
name: "no key",
3023
input: &types.MsgClaimRewards{
3124
LockerAddress: ValidAddress1.String(),
32-
Key: "nonKey",
25+
Key: InvalidKey,
3326
},
3427
expErr: true,
3528
expErrMsg: "key not found",
@@ -39,7 +32,7 @@ func (suite *KeeperTestSuite) TestMsgClaimRewards() {
3932
name: "no lock",
4033
input: &types.MsgClaimRewards{
4134
LockerAddress: ValidAddress2.String(),
42-
Key: "Key1",
35+
Key: ValidKey2,
4336
},
4437
expErr: true,
4538
expErrMsg: "lock not found",
@@ -49,12 +42,12 @@ func (suite *KeeperTestSuite) TestMsgClaimRewards() {
4942
name: "valid request",
5043
input: &types.MsgClaimRewards{
5144
LockerAddress: ValidAddress1.String(),
52-
Key: "Key0",
45+
Key: ValidKey1,
5346
},
5447
expErr: false,
5548
expErrMsg: "",
5649
postCheck: func() {
57-
lock, err := suite.restakeKeeper.GetLock(ctx, ValidAddress1, "Key0")
50+
lock, err := suite.restakeKeeper.GetLock(ctx, ValidAddress1, ValidKey1)
5851
suite.Require().NoError(err)
5952
suite.Require().Equal(sdk.NewCoins(sdk.NewCoin("uband", sdkmath.NewInt(1))), lock.PosRewardDebts)
6053
},

0 commit comments

Comments
 (0)