resolve merge issues

2026-04-27 01:33:33 +00:00 · 2023-07-07 10:17:04 -04:00
parent cfe2452533
commit c4da1ba450
14 changed files with 143 additions and 109 deletions
--- a/consensus/fork_choice/src/fork_choice.rs
+++ b/consensus/fork_choice/src/fork_choice.rs
@@ -770,7 +770,8 @@ where
            (parent_justified, parent_finalized)
        } else {
            let justification_and_finalization_state = match block {
-               BeaconBlockRef::Deneb(_)| BeaconBlockRef::Capella(_)
+                BeaconBlockRef::Deneb(_)
+                | BeaconBlockRef::Capella(_)
                | BeaconBlockRef::Merge(_)
                | BeaconBlockRef::Altair(_) => match progressive_balances_mode {
                    ProgressiveBalancesMode::Disabled => {