Fix conflicts rebasing eip4844

beacon_node/http_api/tests/common.rs

@@ -1,7 +1,5 @@
 use beacon_chain::{
-    test_utils::{
-        BeaconChainHarness, BoxedMutator, Builder as HarnessBuilder, EphemeralHarnessType,
-    },
+    test_utils::{BeaconChainHarness, BoxedMutator, EphemeralTestingSlotClockHarnessType},
     BeaconChain, BeaconChainTypes,
 };
 use directory::DEFAULT_ROOT_DIR;
@@ -39,7 +37,7 @@ pub const EXTERNAL_ADDR: &str = "/ip4/0.0.0.0/tcp/9000";
 
 /// HTTP API tester that allows interaction with the underlying beacon chain harness.
 pub struct InteractiveTester<E: EthSpec> {
-    pub harness: BeaconChainHarness<EphemeralHarnessType<E>>,
+    pub harness: BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>,
     pub client: BeaconNodeHttpClient,
     pub network_rx: NetworkReceivers<E>,
     _server_shutdown: oneshot::Sender<()>,

beacon_node/http_api/tests/tests.rs

@@ -1,7 +1,10 @@
 use crate::common::{create_api_server, create_api_server_on_port, ApiServer};
 use beacon_chain::test_utils::RelativeSyncCommittee;
 use beacon_chain::{
-    test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType},
+    test_utils::{
+        AttestationStrategy, BeaconChainHarness, BlockStrategy,
+        EphemeralTestingSlotClockHarnessType,
+    },
     BeaconChain, StateSkipConfig, WhenSlotSkipped, MAXIMUM_GOSSIP_CLOCK_DISPARITY,
 };
 use environment::null_logger;
@@ -57,8 +60,8 @@ const SKIPPED_SLOTS: &[u64] = &[
 ];
 
 struct ApiTester {
-    harness: Arc<BeaconChainHarness<EphemeralHarnessType<E>>>,
-    chain: Arc<BeaconChain<EphemeralHarnessType<E>>>,
+    harness: Arc<BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>>,
+    chain: Arc<BeaconChain<EphemeralTestingSlotClockHarnessType<E>>>,
     client: BeaconNodeHttpClient,
     next_block: SignedBeaconBlock<E>,
     reorg_block: SignedBeaconBlock<E>,