Fix conflicts rebasing eip4844

This commit is contained in:
Emilia Hane
2023-02-06 14:36:38 +01:00
parent 7545ae9e9b
commit 5437dcae9c
6 changed files with 14 additions and 26 deletions

View File

@@ -3,14 +3,16 @@
mod tests {
use crate::persisted_dht::load_dht;
use crate::{NetworkConfig, NetworkService};
use beacon_chain::test_utils::BeaconChainHarness;
use beacon_chain::test_utils::{
BeaconChainHarness, EphemeralSystemTimeSlotClockHarnessType as HarnessType,
};
use lighthouse_network::Enr;
use slog::{o, Drain, Level, Logger};
use sloggers::{null::NullLoggerBuilder, Build};
use std::str::FromStr;
use std::sync::Arc;
use tokio::runtime::Runtime;
use types::MinimalEthSpec;
use types::MinimalEthSpec as E;
fn get_logger(actual_log: bool) -> Logger {
if actual_log {
@@ -34,7 +36,7 @@ mod tests {
fn test_dht_persistence() {
let log = get_logger(false);
let beacon_chain = BeaconChainHarness::builder(MinimalEthSpec)
let beacon_chain = BeaconChainHarness::<HarnessType<E>>::builder(E)
.default_spec()
.deterministic_keypairs(8)
.fresh_ephemeral_store()