mirror of
https://github.com/sigp/lighthouse.git
synced 2026-04-20 22:38:34 +00:00
resolve merge conflicts
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user