Fix conflicts rebasing eip4844

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

View File

@@ -1,4 +1,4 @@
use beacon_chain::test_utils::EphemeralHarnessType;
use beacon_chain::test_utils::EphemeralTestingSlotClockHarnessType;
use environment::null_logger;
use http_metrics::Config;
use reqwest::StatusCode;
@@ -7,7 +7,7 @@ use std::sync::Arc;
use tokio::sync::oneshot;
use types::MainnetEthSpec;
type Context = http_metrics::Context<EphemeralHarnessType<MainnetEthSpec>>;
type Context = http_metrics::Context<EphemeralTestingSlotClockHarnessType<MainnetEthSpec>>;
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn returns_200_ok() {