gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-27 01:33:33 +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 16:10:57 +01:00
parent c7b49feb9e
commit 2653f88b5f
3 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_node/beacon_chain/tests/rewards.rs
View File

@@ -3,7 +3,8 @@
use std::collections::HashMap;
use beacon_chain::test_utils::{
generate_deterministic_keypairs, BeaconChainHarness, EphemeralHarnessType,
generate_deterministic_keypairs, BeaconChainHarness,
EphemeralTestingSlotClockHarnessType as HarnessType,
};
use beacon_chain::{
test_utils::{AttestationStrategy, BlockStrategy, RelativeSyncCommittee},
@@ -17,7 +18,7 @@ lazy_static! {
static ref KEYPAIRS: Vec<Keypair> = generate_deterministic_keypairs(VALIDATOR_COUNT);
}
fn get_harness<E: EthSpec>() -> BeaconChainHarness<EphemeralHarnessType<E>> {
fn get_harness<E: EthSpec>() -> BeaconChainHarness<HarnessType<E>> {
let mut spec = E::default_spec();
spec.altair_fork_epoch = Some(Epoch::new(0)); // We use altair for all tests