Merge spec crate into types

This commit is contained in:
Paul Hauner
2019-01-25 13:52:21 +11:00
parent 9c86c07eea
commit ea523c8658
57 changed files with 81 additions and 131 deletions

View File

@@ -6,7 +6,6 @@ edition = "2018"
[dependencies]
bls = { path = "../utils/bls" }
spec = { path = "../spec" }
ssz = { path = "../utils/ssz" }
types = { path = "../types" }
validator_induction = { path = "../validator_induction" }

View File

@@ -1,5 +1,4 @@
use spec::ChainSpec;
use types::{BeaconBlock, BeaconBlockBody, Eth1Data, Hash256};
use types::{BeaconBlock, BeaconBlockBody, ChainSpec, Eth1Data, Hash256};
/// Generate a genesis BeaconBlock.
pub fn genesis_beacon_block(state_root: Hash256, spec: &ChainSpec) -> BeaconBlock {

View File

@@ -1,5 +1,4 @@
use spec::ChainSpec;
use types::{BeaconState, Crosslink, Fork};
use types::{BeaconState, ChainSpec, Crosslink, Fork};
use validator_shuffling::{shard_and_committees_for_cycle, ValidatorAssignmentError};
#[derive(Debug, PartialEq)]

View File

@@ -1,8 +1,3 @@
extern crate spec;
extern crate types;
extern crate validator_induction;
extern crate validator_shuffling;
mod beacon_block;
mod beacon_state;