mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 03:31:45 +00:00
Update to consensus spec v1.4.0-beta.6 (#5094)
* get latest ef tests passing
* fix tests
* Fix invalid payload recovery tests
* Merge branch 'unstable' into update-to-spec-v1.4.0-beta.6
* Revert "fix tests"
This reverts commit 0c875b02e0.
* Fix fork choice def. tests
* Update beacon_node/beacon_chain/tests/payload_invalidation.rs
This commit is contained in:
@@ -961,16 +961,9 @@ impl ProtoArray {
|
||||
node_justified_checkpoint
|
||||
};
|
||||
|
||||
let mut correct_justified = self.justified_checkpoint.epoch == genesis_epoch
|
||||
|| voting_source.epoch == self.justified_checkpoint.epoch;
|
||||
|
||||
if let Some(node_unrealized_justified_checkpoint) = node.unrealized_justified_checkpoint {
|
||||
if !correct_justified && self.justified_checkpoint.epoch + 1 == current_epoch {
|
||||
correct_justified = node_unrealized_justified_checkpoint.epoch
|
||||
>= self.justified_checkpoint.epoch
|
||||
&& voting_source.epoch + 2 >= current_epoch;
|
||||
}
|
||||
}
|
||||
let correct_justified = self.justified_checkpoint.epoch == genesis_epoch
|
||||
|| voting_source.epoch == self.justified_checkpoint.epoch
|
||||
|| voting_source.epoch + 2 >= current_epoch;
|
||||
|
||||
let correct_finalized = self.finalized_checkpoint.epoch == genesis_epoch
|
||||
|| self.is_finalized_checkpoint_or_descendant::<E>(node.root);
|
||||
|
||||
Reference in New Issue
Block a user