Merge pull request #14374 from Comolli/main

Reduce redundant code and memory allocation.
This commit is contained in:
Piotr Tabor 2022-08-29 21:15:06 +02:00 committed by GitHub
commit 77773c7798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -183,8 +183,7 @@ func (c MajorityConfig) VoteResult(votes map[uint64]bool) VoteResult {
return VoteWon return VoteWon
} }
ny := [2]int{} // vote counts for no and yes, respectively var votedCnt int //vote counts for yes.
var missing int var missing int
for id := range c { for id := range c {
v, ok := votes[id] v, ok := votes[id]
@ -193,17 +192,15 @@ func (c MajorityConfig) VoteResult(votes map[uint64]bool) VoteResult {
continue continue
} }
if v { if v {
ny[1]++ votedCnt++
} else {
ny[0]++
} }
} }
q := len(c)/2 + 1 q := len(c)/2 + 1
if ny[1] >= q { if votedCnt >= q {
return VoteWon return VoteWon
} }
if ny[1]+missing >= q { if votedCnt+missing >= q {
return VotePending return VotePending
} }
return VoteLost return VoteLost