Merge spec crate into types

validator_client/Cargo.toml

@@ -13,7 +13,6 @@ grpcio = { version = "0.4", default-features = false, features = ["protobuf-code
 protobuf = "2.0.2"
 protos = { path = "../protos" }
 slot_clock = { path = "../eth2/utils/slot_clock" }
-spec = { path = "../eth2/spec" }
 types = { path = "../eth2/types" }
 slog = "^2.2.3"
 slog-term = "^2.4.0"

validator_client/src/duties/mod.rs

@@ -11,8 +11,8 @@ pub use self::service::DutiesManagerService;
 use self::traits::{BeaconNode, BeaconNodeError};
 use bls::PublicKey;
 use slot_clock::SlotClock;
-use spec::ChainSpec;
 use std::sync::Arc;
+use types::ChainSpec;
 
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum PollOutcome {

validator_client/src/main.rs

@@ -8,10 +8,10 @@ use grpcio::{ChannelBuilder, EnvBuilder};
 use protos::services_grpc::{BeaconBlockServiceClient, ValidatorServiceClient};
 use slog::{error, info, o, Drain};
 use slot_clock::SystemTimeSlotClock;
-use spec::ChainSpec;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::thread;
+use types::ChainSpec;
 
 mod block_producer_service;
 mod config;