Fix unhappy path tests (#17)

* fix test

* get highest qc from new view votes
This commit is contained in:
Giacomo Pasini 2023-04-11 17:14:32 +02:00 committed by GitHub
parent 8b44ca5fe0
commit 6d86b131c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions

View File

@ -466,19 +466,17 @@ class Carnot:
self.rebuild_overlay_from_timeout_qc(timeout_qc)
self.broadcast(timeout_qc) # we broadcast so all nodes can get ready for voting on a new view
def approve_new_view(self, new_views: Set[NewView]):
assert len(set(new_view.view for new_view in new_views)) == 1
def approve_new_view(self, timeout_qc: TimeoutQc, new_views: Set[NewView]):
# newView.view == self.last_timeout_view_qc.view for member of root committee and its children because
# they have already created the timeout_qc. For other nodes newView.view > self.last_timeout_view_qc.view.
if self.last_timeout_view_qc is not None:
assert all(new_view.view >= self.last_timeout_view_qc.view for new_view in new_views)
assert all(new_view.view == new_view.timeout_qc.view for new_view in new_views)
assert all(new_view.view == timeout_qc.view for new_view in new_views)
assert len(new_views) == self.overlay.super_majority_threshold(self.id)
assert all(self.overlay.is_member_of_child_committee(self.id, new_view.sender) for new_view in new_views)
new_views = list(new_views)
timeout_qc = new_views[0].timeout_qc
new_high_qc = timeout_qc.high_qc
# get the highest qc from the new views
new_high_qc = max([new_view.timeout_qc for new_view in new_views] + [timeout_qc.high_qc], key=lambda qc: qc.view)
self.rebuild_overlay_from_timeout_qc(timeout_qc)

View File

@ -1,4 +1,4 @@
from .carnot import *
from carnot import *
from unittest import TestCase
@ -166,19 +166,22 @@ class TestCarnotHappyPath(TestCase):
node.received_timeout_qc(timeout_qc)
# new view votes from leafs
for node in (nodes[int_to_id(_id)] for _id in (2, 3, 4)):
node.approve_new_view(timeout_qc, set())
new_views_leafs_3_4 = [nodes[int_to_id(_id)].latest_event for _id in (3, 4)]
new_view_leaf_2 = nodes[int_to_id(2)].latest_event
# new view votes from committee 1 ()
node_1: MockCarnot = nodes[int_to_id(1)]
node_1.approve_new_view(new_views_leafs_3_4)
node_1.approve_new_view(timeout_qc, new_views_leafs_3_4)
new_view_1 = node_1.latest_event
# committee 1 and committee 2 new view votes
new_views = [new_view_1, new_view_leaf_2]
# forward root childs votes to root committee (compound of just the leader in this case)
leader.approve_new_view(new_views)
leader.approve_new_view(timeout_qc, new_views)
root_new_view = leader.latest_event
leader.propose_block(2, [root_new_view, new_view_1, new_view_leaf_2])