Fix conflicts rebasing eip4844

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

View File

@@ -2,7 +2,7 @@
use crate::test_utils::*;
use crate::test_utils::{SeedableRng, XorShiftRng};
use beacon_chain::test_utils::{
interop_genesis_state, test_spec, BeaconChainHarness,
interop_genesis_state_with_eth1, test_spec, BeaconChainHarness,
EphemeralTestingSlotClockHarnessType as HarnessType, DEFAULT_ETH1_BLOCK_HASH,
};
use beacon_chain::types::{