resolve merge conflicts

This commit is contained in:
Eitan Seri- Levi
2026-03-31 11:06:08 -07:00
38 changed files with 3861 additions and 790 deletions

View File

@@ -1038,6 +1038,12 @@ fn fork_choice_deposit_with_reorg() {
// There is no mainnet variant for this test.
}
#[test]
fn fork_choice_on_execution_payload() {
ForkChoiceHandler::<MinimalEthSpec>::new("on_execution_payload").run();
ForkChoiceHandler::<MainnetEthSpec>::new("on_execution_payload").run();
}
#[test]
fn optimistic_sync() {
OptimisticSyncHandler::<MinimalEthSpec>::default().run();