cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixup! Fix conflicts rebasing eip4844

Browse Source
This commit is contained in:
Emilia Hane 2023-02-06 18:04:24 +01:00
parent db36eb978b
commit 615402abcf
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/http_api/tests/common.rs
View File

@ -1,5 +1,8 @@
use beacon_chain::{ use beacon_chain::{
test_utils::{BeaconChainHarness, BoxedMutator, EphemeralTestingSlotClockHarnessType}, test_utils::{
BeaconChainHarness, BoxedMutator, Builder,
EphemeralTestingSlotClockHarnessType as HarnessType,
},
BeaconChain, BeaconChainTypes, BeaconChain, BeaconChainTypes,
}; };
use directory::DEFAULT_ROOT_DIR; use directory::DEFAULT_ROOT_DIR;
@ -38,7 +41,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. /// HTTP API tester that allows interaction with the underlying beacon chain harness.
pub struct InteractiveTester<E: EthSpec> { pub struct InteractiveTester<E: EthSpec> {
pub harness: BeaconChainHarness<EphemeralTestingSlotClockHarnessType<E>>, pub harness: BeaconChainHarness<HarnessType<E>>,
pub client: BeaconNodeHttpClient, pub client: BeaconNodeHttpClient,
pub network_rx: NetworkReceivers<E>, pub network_rx: NetworkReceivers<E>,
_server_shutdown: oneshot::Sender<()>, _server_shutdown: oneshot::Sender<()>,
@ -56,9 +59,8 @@ pub struct ApiServer<E: EthSpec, SFut: Future<Output = ()>> {
pub external_peer_id: PeerId, pub external_peer_id: PeerId,
} }
type Initializer<E> = Box< type HarnessBuilder<E> = Builder<HarnessType<E>, TestingSlotClock>;
dyn FnOnce(HarnessBuilder<EphemeralHarnessType<E>>) -> HarnessBuilder<EphemeralHarnessType<E>>, type Initializer<E> = Box<dyn FnOnce(HarnessBuilder<E>) -> HarnessBuilder<E>>;
>;
type Mutator<E> = BoxedMutator<E, MemoryStore<E>, MemoryStore<E>, TestingSlotClock>; type Mutator<E> = BoxedMutator<E, MemoryStore<E>, MemoryStore<E>, TestingSlotClock>;
impl<E: EthSpec> InteractiveTester<E> { impl<E: EthSpec> InteractiveTester<E> {