prevent double counting from same endorser (#297)

iotexproject · Nov 7, 2018 · b2bda59 · b2bda59
1 parent a4c1d6d
commit b2bda59
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/endorsement/endorsementset.go b/endorsement/endorsementset.go
@@ -111,6 +111,7 @@ func (s *Set) NumOfValidEndorsements(topics map[ConsensusVoteTopic]bool, endorse
 		if _, ok := endorserSet[endorsement.endorser]; !ok {
 			continue
 		}
+		delete(endorserSet, endorsement.endorser)
 		cnt++
 	}
 

diff --git a/endorsement/endorsementset_test.go b/endorsement/endorsementset_test.go
@@ -44,4 +44,28 @@ func TestAddEndorsement(t *testing.T) {
 	en = NewEndorsement(cv, testaddress.Addrinfo["producer"])
 	require.Equal(nil, set.AddEndorsement(en))
 	require.Equal(2, len(set.endorsements))
+	// Add an endorsement of an existing endorser
+	cv = NewConsensusVote(hash1, 1, 2, LOCK)
+	en = NewEndorsement(cv, testaddress.Addrinfo["alfa"])
+	require.Equal(nil, set.AddEndorsement(en))
+	require.Equal(3, len(set.endorsements))
+	require.Equal(1, set.NumOfValidEndorsements(map[ConsensusVoteTopic]bool{
+		LOCK: true,
+	}, []string{
+		testaddress.Addrinfo["producer"].RawAddress,
+		testaddress.Addrinfo["alfa"].RawAddress,
+	}))
+	require.Equal(2, set.NumOfValidEndorsements(map[ConsensusVoteTopic]bool{
+		PROPOSAL: true,
+	}, []string{
+		testaddress.Addrinfo["producer"].RawAddress,
+		testaddress.Addrinfo["alfa"].RawAddress,
+	}))
+	require.Equal(2, set.NumOfValidEndorsements(map[ConsensusVoteTopic]bool{
+		LOCK:     true,
+		PROPOSAL: true,
+	}, []string{
+		testaddress.Addrinfo["producer"].RawAddress,
+		testaddress.Addrinfo["alfa"].RawAddress,
+	}))
 }