Skip to content

Commit

Permalink
have default module disabled in params. (#787)
Browse files Browse the repository at this point in the history
  • Loading branch information
puneet2019 authored Mar 19, 2024
1 parent 43f3c17 commit eaefc75
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions x/liquidstake/keeper/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func (s *KeeperTestSuite) TestImportExportGenesis() {
{ValidatorAddress: valOpers[0].String(), TargetWeight: math.NewInt(5000)},
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(5000)},
}
params.ModulePaused = false
k.SetParams(ctx, params)
k.UpdateLiquidValidatorSet(ctx)

Expand Down
6 changes: 5 additions & 1 deletion x/liquidstake/keeper/liquidstake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func (s *KeeperTestSuite) TestLiquidStake() {
_, valOpers, _ := s.CreateValidators([]int64{1000000, 2000000, 3000000})
params := s.keeper.GetParams(s.ctx)
params.MinLiquidStakeAmount = math.NewInt(50000)
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -253,6 +254,7 @@ func (s *KeeperTestSuite) TestLiquidStakeFromVestingAccount() {
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(3333)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(3333)},
}
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -303,6 +305,7 @@ func (s *KeeperTestSuite) TestLiquidStakeEdgeCases() {
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(3333)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(3333)},
}
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -341,6 +344,7 @@ func (s *KeeperTestSuite) TestLiquidUnstakeEdgeCases() {
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(3333)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(3333)},
}
params.ModulePaused = false
s.Require().NoError(s.keeper.SetParams(s.ctx, params))
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -408,7 +412,7 @@ func (s *KeeperTestSuite) TestShareInflation() {
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(2500)},
{ValidatorAddress: valOpers[3].String(), TargetWeight: math.NewInt(2500)},
}

params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down
6 changes: 5 additions & 1 deletion x/liquidstake/keeper/rebalancing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func (s *KeeperTestSuite) TestRebalancingCase1() {
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(3000)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(3000)},
}
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
reds := s.keeper.UpdateLiquidValidatorSet(s.ctx)
s.Require().Len(reds, 0)
Expand Down Expand Up @@ -300,6 +301,7 @@ func (s *KeeperTestSuite) TestRebalancingConsecutiveCase() {
{ValidatorAddress: valOpers[6].String(), TargetWeight: math.NewInt(500)},
{ValidatorAddress: valOpers[7].String(), TargetWeight: math.NewInt(500)},
}
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
reds := s.keeper.UpdateLiquidValidatorSet(s.ctx)
s.Require().Len(reds, 0)
Expand Down Expand Up @@ -477,6 +479,7 @@ func (s *KeeperTestSuite) TestAutocompoundStakingRewards() {
{ValidatorAddress: valOpers[0].String(), TargetWeight: math.NewInt(5000)},
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(5000)},
}
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -521,6 +524,7 @@ func (s *KeeperTestSuite) TestRemoveAllLiquidValidator() {
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(2000)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(2000)},
}
params.ModulePaused = false
s.Require().NoError(s.keeper.SetParams(s.ctx, params))
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down Expand Up @@ -561,14 +565,14 @@ func (s *KeeperTestSuite) TestRemoveAllLiquidValidator() {
func (s *KeeperTestSuite) TestUndelegatedFundsNotBecomeFees() {
_, valOpers, _ := s.CreateValidators([]int64{2000000, 2000000, 2000000, 2000000})
params := s.keeper.GetParams(s.ctx)

// configure validators
params.WhitelistedValidators = []types.WhitelistedValidator{
{ValidatorAddress: valOpers[0].String(), TargetWeight: math.NewInt(2000)},
{ValidatorAddress: valOpers[1].String(), TargetWeight: math.NewInt(2000)},
{ValidatorAddress: valOpers[2].String(), TargetWeight: math.NewInt(2000)},
{ValidatorAddress: valOpers[3].String(), TargetWeight: math.NewInt(2000)},
}
params.ModulePaused = false
s.Require().NoError(s.keeper.SetParams(s.ctx, params))
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down
1 change: 1 addition & 0 deletions x/liquidstake/types/liquidstake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ func (s *KeeperTestSuite) TestLiquidStake() {
_, valOpers, _ := s.CreateValidators([]int64{1000000, 2000000, 3000000})
params := s.keeper.GetParams(s.ctx)
params.MinLiquidStakeAmount = math.NewInt(50000)
params.ModulePaused = false
s.keeper.SetParams(s.ctx, params)
s.keeper.UpdateLiquidValidatorSet(s.ctx)

Expand Down
1 change: 1 addition & 0 deletions x/liquidstake/types/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ func DefaultParams() Params {
AutocompoundFeeRate: DefaultAutocompoundFeeRate,
CwLockedPoolAddress: "",
WhitelistAdminAddress: "",
ModulePaused: true,
}
}

Expand Down
6 changes: 4 additions & 2 deletions x/liquidstake/types/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ func TestParams(t *testing.T) {
"unstake_fee_rate": "0.000000000000000000",
"min_liquid_stake_amount": "1000",
"fee_account_address": "persistence1w2q3mashs2k4wcpqzs5q5xewnhnnr7wslr34safzvwqzvuqh3gjqv4j6ev",
"autocompound_fee_rate": "0.050000000000000000"
"autocompound_fee_rate": "0.050000000000000000",
"module_paused": true
}`
require.Equal(t, paramsStr, params.String())

Expand All @@ -40,7 +41,8 @@ func TestParams(t *testing.T) {
"unstake_fee_rate": "0.000000000000000000",
"min_liquid_stake_amount": "1000",
"fee_account_address": "persistence1w2q3mashs2k4wcpqzs5q5xewnhnnr7wslr34safzvwqzvuqh3gjqv4j6ev",
"autocompound_fee_rate": "0.050000000000000000"
"autocompound_fee_rate": "0.050000000000000000",
"module_paused": true
}`
require.Equal(t, paramsStr, params.String())
}
Expand Down

0 comments on commit eaefc75

Please sign in to comment.