fix(consensus): verify vote if not exists

consensus/log/log_test.go

@@ -64,14 +64,14 @@ func TestAddInvalidVoteType(t *testing.T) {
 	log := NewLog()
 	log.MoveToNewHeight(cmt.Validators())
 
-	data, _ := hex.DecodeString("A701050218320301045820BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" +
+	data, _ := hex.DecodeString("A7010F0218320301045820BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" +
 		"055501AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA06f607f6")
 	invVote := new(vote.Vote)
 	err := invVote.UnmarshalCBOR(data)
 	assert.NoError(t, err)
 
 	added, err := log.AddVote(invVote)
-	assert.Error(t, err)
+	assert.ErrorContains(t, err, "unexpected vote type: 15")
 	assert.False(t, added)
 	assert.False(t, log.HasVote(invVote.Hash()))
 }

consensus/voteset/binary_voteset.go

@@ -90,29 +90,33 @@ func (vs *BinaryVoteSet) AllVotes() []*vote.Vote {
 
 // AddVote attempts to add a vote to the VoteSet. Returns an error if the vote is invalid.
 func (vs *BinaryVoteSet) AddVote(vote *vote.Vote) (bool, error) {
-	power, err := vs.voteSet.verifyVote(vote)
-	if err != nil {
-		return false, err
-	}
+	var dupErr error
 
 	roundVotes := vs.mustGetRoundVotes(vote.CPRound())
-	existingVote, ok := roundVotes.allVotes[vote.Signer()]
-	if ok {
+	existingVote, exists := roundVotes.allVotes[vote.Signer()]
+	if exists {
 		if existingVote.Hash() == vote.Hash() {
 			// The vote is already added
 			return false, nil
 		}
 
 		// It is a duplicated vote
-		err = ErrDuplicatedVote
-	} else {
+		dupErr = ErrDuplicatedVote
+	}
+
+	power, err := vs.voteSet.verifyVote(vote)
+	if err != nil {
+		return false, err
+	}
+
+	if !exists {
 		roundVotes.allVotes[vote.Signer()] = vote
 		roundVotes.votedPower += power
 	}
 
 	roundVotes.addVote(vote, power)
 
-	return true, err
+	return true, dupErr
 }
 
 func (vs *BinaryVoteSet) HasOneThirdOfTotalPower(cpRound int16) bool {

consensus/voteset/block_voteset.go

@@ -70,21 +70,25 @@ func (vs *BlockVoteSet) AllVotes() []*vote.Vote {
 
 // AddVote attempts to add a vote to the VoteSet. Returns an error if the vote is invalid.
 func (vs *BlockVoteSet) AddVote(vote *vote.Vote) (bool, error) {
-	power, err := vs.voteSet.verifyVote(vote)
-	if err != nil {
-		return false, err
-	}
+	var dupErr error
 
-	existingVote, ok := vs.allVotes[vote.Signer()]
-	if ok {
+	existingVote, exists := vs.allVotes[vote.Signer()]
+	if exists {
 		if existingVote.Hash() == vote.Hash() {
 			// The vote is already added
 			return false, nil
 		}
 
 		// It is a duplicated vote
-		err = ErrDuplicatedVote
-	} else {
+		dupErr = ErrDuplicatedVote
+	}
+
+	power, err := vs.voteSet.verifyVote(vote)
+	if err != nil {
+		return false, err
+	}
+
+	if !exists {
 		vs.allVotes[vote.Signer()] = vote
 	}
 
@@ -95,7 +99,7 @@ func (vs *BlockVoteSet) AddVote(vote *vote.Vote) (bool, error) {
 		vs.quorumHash = &h
 	}
 
-	return true, err
+	return true, dupErr
 }
 
 // HasQuorumHash checks if there is a block that has received quorum votes (2/3+ of total power).

types/vote/vote_type.go

@@ -1,5 +1,9 @@
 package vote
 
+import (
+	"fmt"
+)
+
 type Type int
 
 const (
@@ -33,6 +37,6 @@ func (t Type) String() string {
 	case VoteTypeCPDecided:
 		return "DECIDED"
 	default:
-		return ("invalid vote type")
+		return fmt.Sprintf("%d", t)
 	}
 }