Merge branch 'master' into abdulla/issue-312

Author: ashcherbakov

integration_tests/cli/validator-demo.sh

@@ -202,6 +202,11 @@ result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator
 check_response "$result" "\"code\": 0"
 echo "$result"
 
+test_divider
+
+echo "node admin doesn't add a new validator with new pubkey, because node admin already has disabled validator"
+result="$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator add-node --pubkey='$pubkey' --moniker="$node_name" --from="$account" --yes 2>&1 || true")"
+response_does_not_contain "$result" "\"code\": 0"
 
 test_divider
 
@@ -294,6 +299,11 @@ result=$(dcld tx validator approve-disable-node --address="$validator_address" -
 check_response "$result" "\"code\": 0"
 echo "$result"
 
+test_divider
+
+echo "node admin doesn't add a new validator with new pubkey, because node admin already has disabled validator"
+result="$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator add-node --pubkey='$pubkey' --moniker="$node_name" --from="$account" --yes 2>&1 || true")"
+response_does_not_contain "$result" "\"code\": 0"
 
 test_divider
 

integration_tests/grpc_rest/validator/helpers.go

@@ -253,6 +253,10 @@ func Demo(suite *utils.TestSuite) {
 	_, err = DisableValidator(suite, validatorAddr, nodeAdminName, nodeAdminAcc)
 	require.NoError(suite.T, err)
 
+	// node admin doesn't add a new validator with new pubkey, because node admin already has disabled validator
+	_, err = CreateValidator(suite, validatorAddr, nodeAdminName, nodeAdminAcc, testconstants.ValidatorPubKey2, "test123")
+	require.Error(suite.T, err)
+
 	// Query disabled validator
 	disabledValidator, err := GetDisabledValidator(suite, validatorAddr)
 	require.NoError(suite.T, err)
@@ -274,10 +278,6 @@ func Demo(suite *utils.TestSuite) {
 	require.NoError(suite.T, err)
 	require.Empty(suite.T, disabledValidators)
 
-	//
-	//
-	//
-
 	// Propose disable validator
 	_, err = ProposeDisableValidator(suite, validatorAddr, aliceName, aliceAccount, testconstants.Info)
 	require.NoError(suite.T, err)
@@ -298,6 +298,10 @@ func Demo(suite *utils.TestSuite) {
 	_, err = ApproveDisableValidator(suite, validatorAddr, jackName, jackAccount, testconstants.Info)
 	require.NoError(suite.T, err)
 
+	// node admin doesn't add a new validator with new pubkey, because node admin already has disabled validator
+	_, err = CreateValidator(suite, validatorAddr, nodeAdminName, nodeAdminAcc, testconstants.ValidatorPubKey2, "test123")
+	require.Error(suite.T, err)
+
 	// Query disabled validator
 	disabledValidator, err = GetDisabledValidator(suite, validatorAddr)
 	require.NoError(suite.T, err)

x/validator/handler_test.go

@@ -629,7 +629,7 @@ func TestHandler_OwnerNodeAdminCanEnabledValidator(t *testing.T) {
 	require.False(t, isFound)
 }
 
-func TestHandler_TrusteeDisabkedValidatorOwnerNodeAdminCanEnableValidator(t *testing.T) {
+func TestHandler_TrusteeDisabledValidatorOwnerNodeAdminCanEnableValidator(t *testing.T) {
 	setup := Setup(t)
 
 	// create Trustees
@@ -651,7 +651,7 @@ func TestHandler_TrusteeDisabkedValidatorOwnerNodeAdminCanEnableValidator(t *tes
 	valAddress, err := sdk.ValAddressFromBech32(testconstants.ValidatorAddress1)
 	require.NoError(t, err)
 
-	// create Trustee and NodeAdmin
+	// create NodeAdmin
 	ba4 := authtypes.NewBaseAccount(sdk.AccAddress(valAddress), testconstants.PubKey4, 0, 0)
 	account4 := dclauthtypes.NewAccount(ba4,
 		dclauthtypes.AccountRoles{dclauthtypes.NodeAdmin}, nil, testconstants.VendorID4)
@@ -676,6 +676,88 @@ func TestHandler_TrusteeDisabkedValidatorOwnerNodeAdminCanEnableValidator(t *tes
 	require.False(t, isFound)
 }
 
+func TestHandler_OwnerNodeAdminDisabledValidatorAndNodeAdminCanNotAddNewValidator(t *testing.T) {
+	setup := Setup(t)
+
+	valAddress, err := sdk.ValAddressFromBech32(testconstants.ValidatorAddress1)
+	require.NoError(t, err)
+
+	// create NodeAdmin
+	ba1 := authtypes.NewBaseAccount(sdk.AccAddress(valAddress), testconstants.PubKey1, 0, 0)
+	account1 := dclauthtypes.NewAccount(ba1,
+		dclauthtypes.AccountRoles{dclauthtypes.NodeAdmin}, nil, testconstants.VendorID1)
+	setup.DclauthKeeper.SetAccount(setup.Ctx, account1)
+
+	// node admin disable validator
+	msgDisableValidator := types.NewMsgDisableValidator(valAddress)
+	_, err = setup.Handler(setup.Ctx, msgDisableValidator)
+	require.NoError(t, err)
+
+	msgCreateValidator, err := types.NewMsgCreateValidator(
+		valAddress,
+		testconstants.ValidatorPubKey2,
+		&types.Description{Moniker: testconstants.ProductName},
+	)
+	require.NoError(t, err)
+
+	// node admin try to add a new validator
+	_, err = setup.Handler(setup.Ctx, msgCreateValidator)
+	require.Error(t, err)
+}
+
+func TestHandler_TrusteeDisabledValidatorAndOwnerNodeAdminCanNotAddNewValidator(t *testing.T) {
+	setup := Setup(t)
+
+	// create Trustees
+	ba1 := authtypes.NewBaseAccount(testconstants.Address1, testconstants.PubKey1, 0, 0)
+	account1 := dclauthtypes.NewAccount(ba1,
+		dclauthtypes.AccountRoles{dclauthtypes.Trustee}, nil, testconstants.VendorID1)
+	setup.DclauthKeeper.SetAccount(setup.Ctx, account1)
+
+	ba2 := authtypes.NewBaseAccount(testconstants.Address2, testconstants.PubKey2, 0, 0)
+	account2 := dclauthtypes.NewAccount(ba2,
+		dclauthtypes.AccountRoles{dclauthtypes.Trustee}, nil, testconstants.VendorID2)
+	setup.DclauthKeeper.SetAccount(setup.Ctx, account2)
+
+	ba3 := authtypes.NewBaseAccount(testconstants.Address3, testconstants.PubKey3, 0, 0)
+	account3 := dclauthtypes.NewAccount(ba3,
+		dclauthtypes.AccountRoles{dclauthtypes.Trustee}, nil, testconstants.VendorID3)
+	setup.DclauthKeeper.SetAccount(setup.Ctx, account3)
+
+	valAddress, err := sdk.ValAddressFromBech32(testconstants.ValidatorAddress1)
+	require.NoError(t, err)
+
+	// create NodeAdmin
+	ba4 := authtypes.NewBaseAccount(sdk.AccAddress(valAddress), testconstants.PubKey4, 0, 0)
+	account4 := dclauthtypes.NewAccount(ba4,
+		dclauthtypes.AccountRoles{dclauthtypes.NodeAdmin}, nil, testconstants.VendorID4)
+	setup.DclauthKeeper.SetAccount(setup.Ctx, account4)
+
+	// propose new disable validator
+	msgProposeDisableValidator1 := NewMsgProposeDisableValidator(account1.GetAddress(), valAddress)
+	_, err = setup.Handler(setup.Ctx, msgProposeDisableValidator1)
+	require.NoError(t, err)
+
+	// approve new disable validator
+	msgProposeDisableValidator2 := NewMsgApproveDisableValidator(account2.GetAddress(), valAddress)
+	_, err = setup.Handler(setup.Ctx, msgProposeDisableValidator2)
+	require.NoError(t, err)
+
+	_, isFound := setup.ValidatorKeeper.GetDisabledValidator(setup.Ctx, valAddress.String())
+	require.True(t, isFound)
+
+	msgCreateValidator, err := types.NewMsgCreateValidator(
+		valAddress,
+		testconstants.ValidatorPubKey2,
+		&types.Description{Moniker: testconstants.ProductName},
+	)
+	require.NoError(t, err)
+
+	// node admin try to add a new validator
+	_, err = setup.Handler(setup.Ctx, msgCreateValidator)
+	require.Error(t, err)
+}
+
 func NewMsgProposeDisableValidator(signer sdk.AccAddress, address sdk.ValAddress) *types.MsgProposeDisableValidator {
 	return &types.MsgProposeDisableValidator{
 		Creator: signer.String(),