revert 8909 (#8960)

* revert 8909 * remove entry from CHANGELOG * fix test
cosmos · Apr 6, 2021 · 5247a55 · 5247a55
1 parent b102a72
commit 5247a55
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -92,7 +92,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* (x/staking) [\#8909](https://github.com/cosmos/cosmos-sdk/pull/8909) Require self delegation in `MsgCreateValidator` to be at least one consensus power.
 * (x/bank) [\#8614](https://github.com/cosmos/cosmos-sdk/issues/8614) Add `Name` and `Symbol` fields to denom metadata
 * (x/auth) [\#8522](https://github.com/cosmos/cosmos-sdk/pull/8522) Allow to query all stored accounts
 * (crypto/types) [\#8600](https://github.com/cosmos/cosmos-sdk/pull/8600) `CompactBitArray`: optimize the `NumTrueBitsBefore` method and add an `Equal` method.

diff --git a/x/staking/client/cli/cli_test.go b/x/staking/client/cli/cli_test.go
@@ -96,7 +96,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()),
 	)
@@ -130,7 +130,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),
@@ -150,7 +150,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),
@@ -170,7 +170,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
@@ -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
@@ -140,11 +140,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
@@ -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 {