github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

event_graph: rewrite find_ancestor()

Browse Source
This commit is contained in:
Dastan-glitch
2023-08-17 05:22:02 +03:00
parent 02590af115
commit 0adf421d71
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/event_graph/model.rs
View File

@@ -338,7 +338,7 @@ where
}
// Find common ancestor between two events
fn find_ancestor(&self, mut node_a: EventId, mut node_b: EventId) -> EventId {
fn find_ancestor(&self, mut node_a: EventId, node_b: EventId) -> EventId {
// node_a is a child of node_b
let is_child = node_b == self.event_map.get(&node_a).unwrap().parent.unwrap();
if is_child {
@@ -348,24 +348,20 @@ where
loop {
let node_a_parent = self.event_map.get(&node_a).unwrap().parent.unwrap();
node_a = node_a_parent;
if node_a == self.current_root {
return self.current_root
}
if self.event_map.get(&node_a).unwrap().children.len() > 1 {
break
let offsprings = self
.get_offspring(&node_a)
.iter()
.map(|event| event.hash())
.collect::<Vec<EventId>>();
if offsprings.contains(&node_b) {
return node_a
}
}
}
loop {
let node_b_parent = self.event_map.get(&node_b).unwrap().parent.unwrap();
node_b = node_b_parent;
if node_b == node_a {
break
}
}
if node_a == self.current_root || node_b == self.current_root {
return self.current_root
}
node_a
}
// Find the length between two events