delete revokeStake msg

markall93 · Sep 13, 2018 · 212a6cc · 212a6cc
1 parent 31ca63a
commit 212a6cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/test/vote/revoke_test.go b/test/vote/revoke_test.go
@@ -51,16 +51,13 @@ func TestVoterRevoke(t *testing.T) {
 	delegatorWithdrawMsg := vote.NewDelegatorWithdrawMsg(delegator1Name, newAccountName,
 		types.LNO("70000"))
 	test.SignCheckDeliver(t, lb, delegatorWithdrawMsg, 1, true, delegator1TransactionPriv, baseTime)
-	//all validators cannot revoke voter candidancy
-	RevokeStakeMsg := vote.NewRevokeStakeMsg(newAccountName)
-	test.SimulateOneBlock(lb, baseTime)
-	test.SignCheckDeliver(t, lb, RevokeStakeMsg, 2, false, newAccountTransactionPriv, baseTime)
 
-	//validators can revoke voter candidancy after revoking validator candidancy
+	//validators can stake out after revoking validator candidancy
+	stakeOutMsg := vote.NewStakeOutMsg(newAccountName, types.LNO("300000"))
 	valRevokeMsg := val.NewValidatorRevokeMsg(newAccountName)
-	test.SignCheckDeliver(t, lb, valRevokeMsg, 3, true, newAccountTransactionPriv, baseTime)
+	test.SignCheckDeliver(t, lb, valRevokeMsg, 2, true, newAccountTransactionPriv, baseTime)
 	test.SimulateOneBlock(lb, baseTime)
-	test.SignCheckDeliver(t, lb, RevokeStakeMsg, 4, true, newAccountTransactionPriv, baseTime)
+	test.SignCheckDeliver(t, lb, stakeOutMsg, 3, true, newAccountTransactionPriv, baseTime)
 
 	// check delegator withdraw first coin return
 	test.SimulateOneBlock(lb, baseTime+test.CoinReturnIntervalSec+1)

diff --git a/x/vote/handler_test.go b/x/vote/handler_test.go
@@ -127,20 +127,12 @@ func TestRevokeBasic(t *testing.T) {
 
 	// user1 can revoke voter candidancy now
 	referenceList := &model.ReferenceList{
-		AllValidators: []types.AccountKey{user1},
+		AllValidators: []types.AccountKey{},
 	}
 	vm.storage.SetReferenceList(ctx, referenceList)
-	msg5 := NewRevokeStakeMsg("user1")
+	msg5 := NewStakeOutMsg("user1", coinToString(voteParam.VoterMinDeposit))
 	result2 := handler(ctx, msg5)
 	assert.Equal(t, ErrValidatorCannotRevoke().Result(), result2)
-	// invalid user cannot revoke
-	invalidMsg := NewRevokeStakeMsg("wqwdqwdasdsa")
-	resultInvalid := handler(ctx, invalidMsg)
-	assert.Equal(t, model.ErrVoterNotFound().Result(), resultInvalid)
-	// user1 can revoke voter candidancy now
-	referenceList = &model.ReferenceList{
-		AllValidators: []types.AccountKey{},
-	}
 
 	vm.storage.SetReferenceList(ctx, referenceList)
 	result3 := handler(ctx, msg5)