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

@@ -191,14 +191,14 @@ impl DatabasePubkey {
#[cfg(test)]
mod test {
use super::*;
use crate::test_utils::{BeaconChainHarness, EphemeralHarnessType};
use crate::test_utils::{BeaconChainHarness, EphemeralTestingSlotClockHarnessType};
use logging::test_logger;
use std::sync::Arc;
use store::HotColdDB;
use types::{BeaconState, EthSpec, Keypair, MainnetEthSpec};
type E = MainnetEthSpec;
type T = EphemeralHarnessType<E>;
type T = EphemeralTestingSlotClockHarnessType<E>;
fn get_state(validator_count: usize) -> (BeaconState<E>, Vec<Keypair>) {
let harness = BeaconChainHarness::builder(MainnetEthSpec)