cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Modify proto array loop (#2154)

Browse Source 
## Issue Addressed

NA

## Proposed Changes

As discussed with @protolambda, add an additional loop inside proto_array to ensure weights are coherent.

## Additional Info

NA
This commit is contained in:
Paul Hauner 2021-01-19 03:50:12 +00:00
parent 51f7724c76
commit 8892114f52
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
consensus/proto_array/src/proto_array.rs
View File

@ -113,7 +113,7 @@ impl ProtoArray {
.ok_or(Error::DeltaOverflow(node_index))?; .ok_or(Error::DeltaOverflow(node_index))?;
} }
// If the node has a parent, try to update its best-child and best-descendant. // Update the parent delta (if any).
if let Some(parent_index) = node.parent { if let Some(parent_index) = node.parent {
let parent_delta = deltas let parent_delta = deltas
.get_mut(parent_index) .get_mut(parent_index)
@ -121,7 +121,22 @@ impl ProtoArray {
// Back-propagate the nodes delta to its parent. // Back-propagate the nodes delta to its parent.
*parent_delta += node_delta; *parent_delta += node_delta;
}
}
// A second time, iterate backwards through all indices in `self.nodes`.
//
// We _must_ perform these functions separate from the weight-updating loop above to ensure
// that we have a fully coherent set of weights before updating parent
// best-child/descendant.
for node_index in (0..self.nodes.len()).rev() {
let node = self
.nodes
.get_mut(node_index)
.ok_or(Error::InvalidNodeIndex(node_index))?;
// If the node has a parent, try to update its best-child and best-descendant.
if let Some(parent_index) = node.parent {
self.maybe_update_best_child_and_descendant(parent_index, node_index)?; self.maybe_update_best_child_and_descendant(parent_index, node_index)?;
} }
} }