logos-co
/
nomos-node
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor parent committee methods to return optional parent instead of empty one (#282)

This commit is contained in:
Daniel Sanchez 2023-08-01 09:19:29 +02:00 committed by GitHub
parent f21f1ea10a
commit ae59be5466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consensus-engine/src/lib.rs
View File

@ -135,7 +135,10 @@ impl<O: Overlay> Carnot<O> {
let to = if new_state.overlay.is_member_of_root_committee(new_state.id) {
[new_state.overlay.next_leader()].into_iter().collect()
} else {
new_state.overlay.parent_committee(self.id)
new_state
.overlay
.parent_committee(self.id)
.expect("Non root committee members parent should be present")
};
(
new_state,
@ -203,7 +206,10 @@ impl<O: Overlay> Carnot<O> {
let to = if new_state.overlay.is_member_of_root_committee(new_state.id) {
[new_state.overlay.next_leader()].into_iter().collect()
} else {
new_state.overlay.parent_committee(new_state.id)
new_state
.overlay
.parent_committee(new_state.id)
.expect("Non root committee members parent should be present")
};
(
new_state,
@ -360,7 +366,7 @@ impl<O: Overlay> Carnot<O> {
self.overlay.child_committees(self.id)
}
pub fn parent_committee(&self) -> Committee {
pub fn parent_committee(&self) -> Option<Committee> {
self.overlay.parent_committee(self.id)
}

12
consensus-engine/src/overlay/flat_overlay.rs
View File

@ -63,12 +63,8 @@ where
false
}
fn parent_committee(&self, _id: NodeId) -> crate::Committee {
std::iter::once(self.next_leader()).collect()
}
fn node_committee(&self, _id: NodeId) -> crate::Committee {
self.nodes.clone().into_iter().collect()
fn parent_committee(&self, _id: NodeId) -> Option<crate::Committee> {
Some(std::iter::once(self.next_leader()).collect())
}
fn child_committees(&self, _id: NodeId) -> Vec<crate::Committee> {
@ -79,6 +75,10 @@ where
vec![self.root_committee()]
}
fn node_committee(&self, _id: NodeId) -> crate::Committee {
self.nodes.clone().into_iter().collect()
}
fn next_leader(&self) -> NodeId {
self.leader.next_leader(&self.nodes)
}

2
consensus-engine/src/overlay/mod.rs
View File

@ -21,7 +21,7 @@ pub trait Overlay: Clone {
fn is_member_of_root_committee(&self, id: NodeId) -> bool;
fn is_member_of_leaf_committee(&self, id: NodeId) -> bool;
fn is_child_of_root_committee(&self, id: NodeId) -> bool;
fn parent_committee(&self, id: NodeId) -> Committee;
fn parent_committee(&self, id: NodeId) -> Option<Committee>;
fn child_committees(&self, id: NodeId) -> Vec<Committee>;
fn leaf_committees(&self, id: NodeId) -> Vec<Committee>;
fn node_committee(&self, id: NodeId) -> Committee;

15
consensus-engine/src/overlay/tree_overlay/overlay.rs
View File

@ -66,7 +66,7 @@ where
fn is_member_of_child_committee(&self, parent: NodeId, child: NodeId) -> bool {
let child_parent = self.parent_committee(child);
let parent = self.carnot_tree.committee_by_member_id(&parent);
parent.map_or(false, |p| child_parent.eq(p))
child_parent.as_ref() == parent
}
fn is_member_of_root_committee(&self, id: NodeId) -> bool {
@ -81,16 +81,13 @@ where
}
fn is_child_of_root_committee(&self, id: NodeId) -> bool {
self.parent_committee(id) == self.root_committee()
self.parent_committee(id)
.map(|c| c == self.root_committee())
.unwrap_or(false)
}
fn parent_committee(&self, id: NodeId) -> Committee {
let c = self.carnot_tree.parent_committee_from_member_id(&id);
if !c.is_empty() {
c
} else {
std::iter::once(self.next_leader()).collect()
}
fn parent_committee(&self, id: NodeId) -> Option<Committee> {
self.carnot_tree.parent_committee_from_member_id(&id)
}
fn child_committees(&self, id: NodeId) -> Vec<Committee> {

7
consensus-engine/src/overlay/tree_overlay/tree.rs
View File

@ -78,12 +78,11 @@ impl Tree {
}
}
pub(super) fn parent_committee_from_member_id(&self, id: &NodeId) -> Committee {
let Some(committee_id) = self.committee_id_by_member_id(id) else { return Committee::new(); };
let Some(parent_id) = self.parent_committee(committee_id) else { return Committee::new(); };
pub(super) fn parent_committee_from_member_id(&self, id: &NodeId) -> Option<Committee> {
let committee_id = self.committee_id_by_member_id(id)?;
let parent_id = self.parent_committee(committee_id)?;
self.committee_by_committee_idx(self.committee_id_to_index[parent_id])
.cloned()
.unwrap_or_default()
}
pub(super) fn child_committees(

22
simulations/src/node/carnot/mod.rs
View File

@ -72,8 +72,8 @@ pub struct CarnotState {
last_view_timeout_qc: Option<TimeoutQc>,
latest_committed_block: Block,
latest_committed_view: View,
root_committe: Committee,
parent_committe: Committee,
root_committee: Committee,
parent_committee: Option<Committee>,
child_committees: Vec<Committee>,
committed_blocks: Vec<BlockId>,
step_duration: Duration,
@ -129,9 +129,9 @@ impl serde::Serialize for CarnotState {
LATEST_COMMITTED_VIEW => {
ser.serialize_field(LATEST_COMMITTED_VIEW, &self.latest_committed_view)?
}
ROOT_COMMITTEE => ser.serialize_field(ROOT_COMMITTEE, &self.root_committe)?,
ROOT_COMMITTEE => ser.serialize_field(ROOT_COMMITTEE, &self.root_committee)?,
PARENT_COMMITTEE => {
ser.serialize_field(PARENT_COMMITTEE, &self.parent_committe)?
ser.serialize_field(PARENT_COMMITTEE, &self.parent_committee)?
}
CHILD_COMMITTEES => {
ser.serialize_field(CHILD_COMMITTEES, &self.child_committees)?
@ -178,8 +178,8 @@ impl<O: Overlay> From<&Carnot<O>> for CarnotState {
node_id,
current_view,
local_high_qc: value.high_qc(),
parent_committe: value.parent_committee(),
root_committe: value.root_committee(),
parent_committee: value.parent_committee(),
root_committee: value.root_committee(),
child_committees: value.child_committees(),
latest_committed_block: value.latest_committed_block(),
latest_committed_view: value.latest_committed_view(),
@ -361,8 +361,16 @@ impl<L: UpdateableLeaderSelection, O: Overlay<LeaderSelection = L>> CarnotNode<O
}
if self.engine.overlay().is_member_of_leaf_committee(self.id) {
// Check if we are also a member of the parent committee, this is a special case for the flat committee
let to = if self.engine.overlay().is_child_of_root_committee(self.id) {
[self.engine.overlay().next_leader()].into_iter().collect()
} else {
self.engine.parent_committee().expect(
"Parent committee of non root committee members should be present",
)
};
output = Some(Output::Send(consensus_engine::Send {
to: self.engine.parent_committee(),
to,
payload: Payload::Vote(Vote {
view: self.engine.current_view(),
block: block.header().id,