gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-16 20:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts rebasing eip4844

Browse Source
This commit is contained in:
Emilia Hane
2023-02-06 14:33:17 +01:00
parent 994990063a
commit d292a3a6a8
19 changed files with 492 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/beacon_chain/tests/merge.rs
View File

@@ -48,7 +48,7 @@ async fn merge_with_terminal_block_hash_override() {
spec.terminal_block_hash = genesis_pow_block_hash;
let harness = BeaconChainHarness::builder(E::default())
let harness = BeaconChainHarness::builder(E::default(), TestingSlotClock)
.spec(spec)
.logger(logging::test_logger())
.deterministic_keypairs(VALIDATOR_COUNT)
@@ -105,7 +105,7 @@ async fn base_altair_merge_with_terminal_block_after_fork() {
let mut execution_payloads = vec![];
let harness = BeaconChainHarness::builder(E::default())
let harness = BeaconChainHarness::builder(E::default(), TestingSlotClock)
.spec(spec)
.logger(logging::test_logger())
.deterministic_keypairs(VALIDATOR_COUNT)