Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify vote counting

Browse Source
This commit is contained in:
Scott Sadler 2017-02-26 12:28:13 +01:00
parent f858fc8f8d
commit 2116d199d5
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bigchaindb/voting.py
View File

@ -69,12 +69,9 @@ class Voting:
in a separate "cheat" dictionary.
* Votes must agree on previous block, otherwise they become invalid.
"""
n_valid = 0
n_invalid = 0
prev_blocks = collections.Counter()
cheat = []
malformed = []
prev_block = None
# Group by pubkey to detect duplicate voting
by_voter = collections.defaultdict(list)
@ -84,35 +81,28 @@ class Voting:
for pubkey, votes in by_voter.items():
if len(votes) > 1:
cheat.append(votes)
n_invalid += 1
continue
vote = votes[0]
if not cls.verify_vote_schema(vote):
malformed.append(vote)
n_invalid += 1
continue
if vote['vote']['is_block_valid']:
if vote['vote']['is_block_valid'] is True:
prev_blocks[vote['vote']['previous_block']] += 1
n_valid += 1
else:
n_invalid += 1
# Neutralise difference between valid block and previous block,
# so that nodes must agree on previous block
if n_valid:
prev_block, n_prev = prev_blocks.most_common()[0]
n_valid = 0
prev_block = None
# Valid votes must agree on previous block
if prev_blocks:
prev_block, n_valid = prev_blocks.most_common()[0]
del prev_blocks[prev_block]
diff = n_valid - n_prev
n_valid -= diff
n_invalid += diff
return {
'counts': {
'n_valid': n_valid,
'n_invalid': n_invalid,
'n_invalid': len(by_voter) - n_valid,
},
'cheat': cheat,
'malformed': malformed,
@ -126,10 +116,9 @@ class Voting:
Decide on votes.
To return VALID there must be a clear majority that say VALID
and also agree on the previous block. This is achieved using the > operator.
and also agree on the previous block.
A tie on an even number of votes counts as INVALID so the >= operator is
used.
A tie on an even number of votes counts as INVALID.
"""
if n_invalid * 2 >= n_voters:
return INVALID
@ -139,15 +128,8 @@ class Voting:
@classmethod
def verify_vote_signature(cls, vote):
"""Verify the signature of a vote
A valid vote should have been signed by a voter's private key.
Args:
vote (list): voters of the block that is under election
Returns:
bool: True if the signature is correct, False otherwise.
"""
Verify the signature of a vote
"""
signature = vote.get('signature')
pk_base58 = vote.get('node_pubkey')