gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-26 01:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-03-31 11:06:08 -07:00
parent 1eefef610e 77382daab9
commit a538d7b91a
38 changed files with 3861 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/beacon_chain/tests/store_tests.rs
View File

@@ -3995,7 +3995,7 @@ async fn schema_downgrade_to_min_version(store_config: StoreConfig, archive: boo
)
.await;
let min_version = CURRENT_SCHEMA_VERSION;
let min_version = SchemaVersion(28);
// Save the slot clock so that the new harness doesn't revert in time.
let slot_clock = harness.chain.slot_clock.clone();
@@ -5426,10 +5426,12 @@ fn assert_chains_pretty_much_the_same<T: BeaconChainTypes>(a: &BeaconChain<T>, b
.fork_choice_write_lock()
.get_head(slot, &spec)
.unwrap()
.0
== b.canonical_head
.fork_choice_write_lock()
.get_head(slot, &spec)
.unwrap(),
.unwrap()
.0,
"fork_choice heads should be equal"
);
}