From 6b41e6cef0886e3a1d12e90922001bc1ecccb1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?colin=20axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:40:17 +0200 Subject: [PATCH] revert 8909 (#8960) * revert 8909 * remove entry from CHANGELOG * fix test --- x/staking/client/cli/cli_test.go | 8 ++++---- x/staking/simulation/operations.go | 13 +------------ x/staking/types/msg.go | 5 ----- x/staking/types/msg_test.go | 3 +-- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/x/staking/client/cli/cli_test.go b/x/staking/client/cli/cli_test.go index 6ea519aa34..95a90bd0d7 100644 --- a/x/staking/client/cli/cli_test.go +++ b/x/staking/client/cli/cli_test.go @@ -97,7 +97,7 @@ func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() { val.ClientCtx, val.Address, newAddr, - sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10000000))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), + sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(200))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), ) @@ -131,7 +131,7 @@ func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() { { "invalid transaction (missing pubkey)", []string{ - fmt.Sprintf("--%s=%dstake", cli.FlagAmount, sdk.PowerReduction.Int64()), + fmt.Sprintf("--%s=%dstake", cli.FlagAmount, 100), fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity), fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite), fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact), @@ -151,7 +151,7 @@ func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() { "invalid transaction (missing moniker)", []string{ fmt.Sprintf("--%s=%s", cli.FlagPubKey, consPubKeyBz), - fmt.Sprintf("--%s=%dstake", cli.FlagAmount, sdk.PowerReduction.Int64()), + fmt.Sprintf("--%s=%dstake", cli.FlagAmount, 100), fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity), fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite), fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact), @@ -171,7 +171,7 @@ func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() { "valid transaction", []string{ fmt.Sprintf("--%s=%s", cli.FlagPubKey, consPubKeyBz), - fmt.Sprintf("--%s=%dstake", cli.FlagAmount, sdk.PowerReduction.Int64()), + fmt.Sprintf("--%s=%dstake", cli.FlagAmount, 100), fmt.Sprintf("--%s=NewValidator", cli.FlagMoniker), fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity), fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite), diff --git a/x/staking/simulation/operations.go b/x/staking/simulation/operations.go index 9a61a8e3ed..60fd13d21c 100644 --- a/x/staking/simulation/operations.go +++ b/x/staking/simulation/operations.go @@ -112,22 +112,11 @@ func SimulateMsgCreateValidator(ak types.AccountKeeper, bk types.BankKeeper, k k return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgCreateValidator, "balance is negative"), nil, nil } - // A validator can only be created if it has at least one consensus power worth of tokens. - // Construct a maximum random value that is reduced by the PowerReduction, allowing - // for a minimum self delegation of the PowerReduction. - max := balance.Sub(sdk.PowerReduction) - if !max.IsPositive() { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgCreateValidator, "balance doesn't have enough delegation amount"), nil, nil - } - - amount, err := simtypes.RandPositiveInt(r, max) + amount, err := simtypes.RandPositiveInt(r, balance) if err != nil { return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgCreateValidator, "unable to generate positive amount"), nil, err } - // ensure self delegation meets minimum requirement - amount = amount.Add(sdk.PowerReduction) - selfDelegation := sdk.NewCoin(denom, amount) account := ak.GetAccount(ctx, simAccount.Address) diff --git a/x/staking/types/msg.go b/x/staking/types/msg.go index c3a1e895e0..3e2cfee3d4 100644 --- a/x/staking/types/msg.go +++ b/x/staking/types/msg.go @@ -133,11 +133,6 @@ func (msg MsgCreateValidator) ValidateBasic() error { return ErrMinSelfDelegationInvalid } - // ensure delegation is at least one consensus power - if sdk.TokensToConsensusPower(msg.Value.Amount) <= 0 { - return sdkerrors.Wrapf(ErrBadDelegationAmount, "self delegation amount (%s) must be at least one consensus power (%s)", msg.Value.Amount, sdk.PowerReduction) - } - if msg.Value.Amount.LT(msg.MinSelfDelegation) { return ErrSelfDelegationBelowMinimum } diff --git a/x/staking/types/msg_test.go b/x/staking/types/msg_test.go index bae375c9d8..5d3b350b5c 100644 --- a/x/staking/types/msg_test.go +++ b/x/staking/types/msg_test.go @@ -15,7 +15,7 @@ import ( ) var ( - coinPos = sdk.NewInt64Coin(sdk.DefaultBondDenom, sdk.PowerReduction.Int64()) + coinPos = sdk.NewInt64Coin(sdk.DefaultBondDenom, 1000) coinZero = sdk.NewInt64Coin(sdk.DefaultBondDenom, 0) ) @@ -75,7 +75,6 @@ func TestMsgCreateValidator(t *testing.T) { {"zero min self delegation", "a", "b", "c", "d", "e", commission1, sdk.ZeroInt(), valAddr1, pk1, coinPos, false}, {"negative min self delegation", "a", "b", "c", "d", "e", commission1, sdk.NewInt(-1), valAddr1, pk1, coinPos, false}, {"delegation less than min self delegation", "a", "b", "c", "d", "e", commission1, coinPos.Amount.Add(sdk.OneInt()), valAddr1, pk1, coinPos, false}, - {"delegation less than one consensus power", "a", "b", "c", "d", "e", commission1, sdk.OneInt(), valAddr1, pk1, sdk.NewInt64Coin(sdk.DefaultBondDenom, 1000), false}, } for _, tc := range tests {