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

Fix the pending valset check.

Browse Source
This commit is contained in:
Lev Berman 2018-09-20 16:31:17 +02:00
parent 4cd8ee2c97
commit 15e4d39077
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigchaindb/upsert_validator/validator_election.py
View File

@ -42,8 +42,8 @@ class ValidatorElection(Election):
latest_block_height = latest_block['height'] latest_block_height = latest_block['height']
latest_validator_change = bigchain.get_validator_change()['height'] latest_validator_change = bigchain.get_validator_change()['height']
# TODO change to `latest_block_height + 2` when upgrading to Tendermint 0.24.0. # TODO change to `latest_block_height + 3` when upgrading to Tendermint 0.24.0.
if latest_validator_change == latest_block_height + 1: if latest_validator_change == latest_block_height + 2:
# do not conclude the election if there is a change assigned already # do not conclude the election if there is a change assigned already
return False return False

10
tests/elections/test_election.py
View File

@ -39,7 +39,7 @@ def test_process_block_concludes_all_elections(b):
app_hash='')._asdict()) app_hash='')._asdict())
b.store_bulk_transactions(txs) b.store_bulk_transactions(txs)
Election.process_block(b, 1, txs + total_votes) Election.process_block(b, 2, txs + total_votes)
validators = b.get_validators() validators = b.get_validators()
assert len(validators) == 5 assert len(validators) == 5
@ -87,7 +87,7 @@ def test_process_block_approves_only_one_validator_update(b):
app_hash='')._asdict()) app_hash='')._asdict())
b.store_bulk_transactions(txs) b.store_bulk_transactions(txs)
Election.process_block(b, 1, txs + total_votes) Election.process_block(b, 2, txs + total_votes)
validators = b.get_validators() validators = b.get_validators()
assert len(validators) == 5 assert len(validators) == 5
@ -137,7 +137,7 @@ def test_process_block_approves_after_pending_validator_update(b):
app_hash='')._asdict()) app_hash='')._asdict())
b.store_bulk_transactions(txs) b.store_bulk_transactions(txs)
Election.process_block(b, 1, txs + total_votes) Election.process_block(b, 2, txs + total_votes)
validators = b.get_validators() validators = b.get_validators()
assert len(validators) == 5 assert len(validators) == 5
@ -174,7 +174,7 @@ def test_process_block_does_not_approve_after_validator_update(b):
app_hash='')._asdict()) app_hash='')._asdict())
b.store_bulk_transactions(txs) b.store_bulk_transactions(txs)
Election.process_block(b, 1, txs + total_votes) Election.process_block(b, 2, txs + total_votes)
b.store_block(Block(height=2, b.store_block(Block(height=2,
transactions=[v.id for v in total_votes], transactions=[v.id for v in total_votes],
@ -188,7 +188,7 @@ def test_process_block_does_not_approve_after_validator_update(b):
total_votes = votes total_votes = votes
b.store_abci_chain(1, 'chain-X') b.store_abci_chain(1, 'chain-X')
Election.process_block(b, 2, txs + total_votes) Election.process_block(b, 3, txs + total_votes)
assert not b.get_election(election.id)['is_concluded'] assert not b.get_election(election.id)['is_concluded']
assert b.get_latest_abci_chain() == {'height': 1, assert b.get_latest_abci_chain() == {'height': 1,