Remove rest_types

Cargo.toml

@@ -31,7 +31,6 @@ members = [
     "common/lighthouse_version",
     "common/logging",
     "common/lru_cache",
-    "common/rest_types",
     "common/slot_clock",
     "common/test_random_derive",
     "common/warp_utils",

beacon_node/http_metrics/Cargo.toml

@@ -17,6 +17,7 @@ eth2_libp2p = { path = "../eth2_libp2p" }
 slot_clock = { path = "../../common/slot_clock" }
 lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 lazy_static = "1.4.0"
+eth2 = { path = "../../common/eth2" }
 
 [dev-dependencies]
 tokio = { version = "0.2.21", features = ["sync"] }

beacon_node/http_metrics/src/metrics.rs

@@ -1,6 +1,7 @@
 use crate::Context;
 use beacon_chain::BeaconChainTypes;
-use lighthouse_metrics::{health::Health, Encoder, TextEncoder};
+use eth2::lighthouse::Health;
+use lighthouse_metrics::{Encoder, TextEncoder};
 
 pub use lighthouse_metrics::*;
 

beacon_node/network/Cargo.toml

@@ -17,7 +17,6 @@ beacon_chain =  { path = "../beacon_chain" }
 store =  { path = "../store" }
 eth2_libp2p =  { path = "../eth2_libp2p" }
 hashset_delay = { path = "../../common/hashset_delay" }
-rest_types = { path = "../../common/rest_types" }
 types = { path = "../../consensus/types" }
 state_processing = { path = "../../consensus/state_processing" }
 slot_clock = { path = "../../common/slot_clock" }

beacon_node/network/src/attestation_service/mod.rs

@@ -15,9 +15,8 @@ use slog::{crit, debug, error, o, trace, warn};
 use beacon_chain::{BeaconChain, BeaconChainTypes};
 use eth2_libp2p::{types::GossipKind, NetworkGlobals, SubnetDiscovery};
 use hashset_delay::HashSetDelay;
-use rest_types::ValidatorSubscription;
 use slot_clock::SlotClock;
-use types::{Attestation, EthSpec, Slot, SubnetId};
+use types::{Attestation, EthSpec, Slot, SubnetId, ValidatorSubscription};
 
 use crate::metrics;
 

beacon_node/network/src/service.rs

@@ -15,13 +15,12 @@ use eth2_libp2p::{
 };
 use eth2_libp2p::{MessageAcceptance, Service as LibP2PService};
 use futures::prelude::*;
-use rest_types::ValidatorSubscription;
 use slog::{debug, error, info, o, trace, warn};
 use std::{collections::HashMap, sync::Arc, time::Duration};
 use store::HotColdDB;
 use tokio::sync::mpsc;
 use tokio::time::Delay;
-use types::EthSpec;
+use types::{EthSpec, ValidatorSubscription};
 
 mod tests;
 

common/eth2/Cargo.toml

@@ -12,8 +12,6 @@ serde_json = "1.0.52"
 types = { path = "../../consensus/types" }
 hex = "0.4.2"
 reqwest = { version = "0.10.8", features = ["json"] }
-# TODO: remove rest_types dep.
-rest_types = { path = "../rest_types" }
 eth2_libp2p = { path = "../../beacon_node/eth2_libp2p" }
 proto_array = { path = "../../consensus/proto_array", optional = true }
 

common/eth2/src/types.rs

@@ -5,14 +5,11 @@ use std::fmt;
 use std::str::FromStr;
 use types::serde_utils;
 
-// TODO: remove this.
-pub use rest_types::ValidatorSubscription;
-
 pub use types::{
     Address, Attestation, AttestationData, AttesterSlashing, BeaconBlock, BeaconBlockHeader,
     BeaconState, Checkpoint, CommitteeIndex, Epoch, EthSpec, Fork, Graffiti, Hash256,
     ProposerSlashing, PublicKeyBytes, SignatureBytes, SignedAggregateAndProof, SignedBeaconBlock,
-    SignedVoluntaryExit, Slot, Validator, YamlConfig,
+    SignedVoluntaryExit, Slot, Validator, ValidatorSubscription, YamlConfig,
 };
 
 /// An API error serializable to JSON.