Merge spec into types crate.

Also remove some pre-2018 `extern crate` calls.

validator_client/src/block_producer/mod.rs

@@ -7,9 +7,8 @@ mod traits;
 use self::traits::{BeaconNode, BeaconNodeError};
 use super::EpochDutiesMap;
 use slot_clock::SlotClock;
-use spec::ChainSpec;
 use std::sync::{Arc, RwLock};
-use types::BeaconBlock;
+use types::{BeaconBlock, ChainSpec};
 
 pub use self::service::BlockProducerService;
 

validator_client/src/duties/mod.rs

@@ -7,9 +7,9 @@ mod traits;
 use self::traits::{BeaconNode, BeaconNodeError};
 use bls::PublicKey;
 use slot_clock::SlotClock;
-use spec::ChainSpec;
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
+use types::ChainSpec;
 
 pub use self::service::DutiesManagerService;
 

validator_client/src/main.rs

@@ -7,10 +7,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, RwLock};
 use std::thread;
+use types::ChainSpec;
 
 mod block_producer;
 mod config;