gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-10 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into tree-states

Browse Source
This commit is contained in:
Michael Sproul
2023-12-14 09:59:43 +11:00
parent 4741bf1e70 a3a370302a
commit c8dc082ba8
126 changed files with 5081 additions and 3916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
consensus/proto_array/src/proto_array_fork_choice.rs
View File

@@ -188,7 +188,7 @@ where
}
/// Information about the proposer head used for opportunistic re-orgs.
#[derive(Clone)]
#[derive(Debug, Clone)]
pub struct ProposerHeadInfo {
/// Information about the *current* head block, which may be re-orged.
pub head_node: ProtoNode,
@@ -206,7 +206,7 @@ pub struct ProposerHeadInfo {
///
/// This type intentionally does not implement `Debug` so that callers are forced to handle the
/// enum.
#[derive(Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq)]
pub enum ProposerHeadError<E> {
DoNotReOrg(DoNotReOrg),
Error(E),
@@ -243,7 +243,7 @@ impl<E1> ProposerHeadError<E1> {
/// Reasons why a re-org should not be attempted.
///
/// This type intentionally does not implement `Debug` so that the `Display` impl must be used.
#[derive(Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq)]
pub enum DoNotReOrg {
MissingHeadOrParentNode,
MissingHeadFinalizedCheckpoint,