Merge branch 'bootstrap' into interop

This commit is contained in:
Paul Hauner
2019-08-22 17:50:05 +10:00
13 changed files with 139 additions and 72 deletions

View File

@@ -77,7 +77,7 @@ pub enum AttestationProcessingOutcome {
Invalid(AttestationValidationError),
}
pub trait BeaconChainTypes {
pub trait BeaconChainTypes: Send + Sync + 'static {
type Store: store::Store;
type SlotClock: slot_clock::SlotClock;
type LmdGhost: LmdGhost<Self::Store, Self::EthSpec>;

View File

@@ -54,8 +54,8 @@ where
impl<L, E> BeaconChainTypes for CommonTypes<L, E>
where
L: LmdGhost<MemoryStore, E>,
E: EthSpec,
L: LmdGhost<MemoryStore, E> + 'static,
E: EthSpec + 'static,
{
type Store = MemoryStore;
type SlotClock = TestingSlotClock;
@@ -69,8 +69,8 @@ where
/// Used for testing.
pub struct BeaconChainHarness<L, E>
where
L: LmdGhost<MemoryStore, E>,
E: EthSpec,
L: LmdGhost<MemoryStore, E> + 'static,
E: EthSpec + 'static,
{
pub chain: BeaconChain<CommonTypes<L, E>>,
pub keypairs: Vec<Keypair>,