Restructure of validator client service and block producer

validator_client/src/duties/beacon_node_duties.rs

@@ -2,12 +2,12 @@ use super::EpochDuties;
 use types::{Epoch, PublicKey};
 
 #[derive(Debug, PartialEq, Clone)]
-pub enum BeaconNodeError {
+pub enum BeaconNodeDutiesError {
     RemoteFailure(String),
 }
 
 /// Defines the methods required to obtain a validators shuffling from a Beacon Node.
-pub trait BeaconNode: Send + Sync {
+pub trait BeaconNodeDuties: Send + Sync {
     /// Gets the duties for all validators.
     ///
     /// Returns a vector of EpochDuties for each validator public key. The entry will be None for
@@ -16,5 +16,5 @@ pub trait BeaconNode: Send + Sync {
         &self,
         epoch: Epoch,
         pubkeys: &[PublicKey],
-    ) -> Result<EpochDuties, BeaconNodeError>;
+    ) -> Result<EpochDuties, BeaconNodeDutiesError>;
 }

validator_client/src/duties/grpc.rs

@@ -1,5 +1,5 @@
+use super::beacon_node_duties::{BeaconNodeDuties, BeaconNodeDutiesError};
 use super::epoch_duties::{EpochDuties, EpochDuty};
-use super::traits::{BeaconNode, BeaconNodeError};
 use grpcio::CallOption;
 use protos::services::{GetDutiesRequest, Validators};
 use protos::services_grpc::ValidatorServiceClient;
@@ -8,13 +8,13 @@ use std::collections::HashMap;
 use std::time::Duration;
 use types::{Epoch, PublicKey, Slot};
 
-impl BeaconNode for ValidatorServiceClient {
+impl BeaconNodeDuties for ValidatorServiceClient {
     /// Requests all duties (block signing and committee attesting) from the Beacon Node (BN).
     fn request_duties(
         &self,
         epoch: Epoch,
         pubkeys: &[PublicKey],
-    ) -> Result<EpochDuties, BeaconNodeError> {
+    ) -> Result<EpochDuties, BeaconNodeDutiesError> {
         // Get the required duties from all validators
         // build the request
         let mut req = GetDutiesRequest::new();
@@ -29,7 +29,7 @@ impl BeaconNode for ValidatorServiceClient {
         // send the request, get the duties reply
         let reply = self
             .get_validator_duties(&req)
-            .map_err(|err| BeaconNodeError::RemoteFailure(format!("{:?}", err)))?;
+            .map_err(|err| BeaconNodeDutiesError::RemoteFailure(format!("{:?}", err)))?;
 
         let mut epoch_duties: HashMap<PublicKey, Option<EpochDuty>> = HashMap::new();
         for (index, validator_duty) in reply.get_active_validators().iter().enumerate() {

validator_client/src/duties/mod.rs

@@ -1,13 +1,13 @@
+mod beacon_node_duties;
 mod epoch_duties;
 mod grpc;
 // TODO: reintroduce tests
 //#[cfg(test)]
 //mod test_node;
-mod traits;
 
+pub use self::beacon_node_duties::{BeaconNodeDuties, BeaconNodeDutiesError};
 use self::epoch_duties::{EpochDuties, EpochDutiesMapError};
 pub use self::epoch_duties::{EpochDutiesMap, WorkInfo};
-use self::traits::{BeaconNode, BeaconNodeError};
 use futures::Async;
 use slog::{debug, error, info};
 use std::sync::Arc;
@@ -29,7 +29,7 @@ pub enum UpdateOutcome {
 pub enum Error {
     DutiesMapPoisoned,
     EpochMapPoisoned,
-    BeaconNodeError(BeaconNodeError),
+    BeaconNodeDutiesError(BeaconNodeDutiesError),
     UnknownEpoch,
     UnknownValidator,
 }
@@ -38,14 +38,14 @@ pub enum Error {
 /// Node.
 ///
 /// This keeps track of all validator keys and required voting slots.
-pub struct DutiesManager<U: BeaconNode> {
+pub struct DutiesManager<U: BeaconNodeDuties> {
     pub duties_map: RwLock<EpochDutiesMap>,
     /// A list of all public keys known to the validator service.
     pub pubkeys: Vec<PublicKey>,
     pub beacon_node: Arc<U>,
 }
 
-impl<U: BeaconNode> DutiesManager<U> {
+impl<U: BeaconNodeDuties> DutiesManager<U> {
     /// Check the Beacon Node for `EpochDuties`.
     ///
     /// be a wall-clock (e.g., system time, remote server time, etc.).
@@ -112,9 +112,9 @@ impl<U: BeaconNode> DutiesManager<U> {
 }
 
 //TODO: Use error_chain to handle errors
-impl From<BeaconNodeError> for Error {
-    fn from(e: BeaconNodeError) -> Error {
-        Error::BeaconNodeError(e)
+impl From<BeaconNodeDutiesError> for Error {
+    fn from(e: BeaconNodeDutiesError) -> Error {
+        Error::BeaconNodeDutiesError(e)
     }
 }