From 68b33620c29b6d0f6f3dad591f1fdc301573e9a6 Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Fri, 29 Mar 2019 02:23:03 +1100
Subject: [PATCH] Implement Display and clean validator output

---
 .../test_utils/testing_beacon_state_builder.rs  |  2 +-
 validator_client/src/duties/epoch_duties.rs     | 17 ++++++++++++++++-
 validator_client/src/duties/mod.rs              | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/eth2/types/src/test_utils/testing_beacon_state_builder.rs b/eth2/types/src/test_utils/testing_beacon_state_builder.rs
index b38e8b5273..5e4cebd576 100644
--- a/eth2/types/src/test_utils/testing_beacon_state_builder.rs
+++ b/eth2/types/src/test_utils/testing_beacon_state_builder.rs
@@ -120,7 +120,7 @@ impl TestingBeaconStateBuilder {
             })
             .collect();
 
-        let genesis_time = 1553753928; // arbitrary
+        let genesis_time = 1553776331; // arbitrary
 
         let mut state = BeaconState::genesis(
             genesis_time,
diff --git a/validator_client/src/duties/epoch_duties.rs b/validator_client/src/duties/epoch_duties.rs
index 5c23e82b1e..f177377894 100644
--- a/validator_client/src/duties/epoch_duties.rs
+++ b/validator_client/src/duties/epoch_duties.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::fmt;
 use std::ops::{Deref, DerefMut};
 use types::{AttestationDuty, Epoch, PublicKey, Slot};
 
@@ -55,11 +56,25 @@ impl EpochDuty {
         None
     }
 }
+
+impl fmt::Display for EpochDuty {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut display_block = String::from("None");
+        if let Some(block_slot) = self.block_production_slot {
+            display_block = block_slot.to_string();
+        }
+        write!(
+            f,
+            "produce block slot: {}, attestation slot: {}, attestation shard: {}",
+            display_block, self.attestation_slot, self.attestation_shard
+        )
+    }
+}
+
 /// Maps a list of public keys (many validators) to an EpochDuty.
 pub type EpochDuties = HashMap<PublicKey, Option<EpochDuty>>;
 
 pub enum EpochDutiesMapError {
-    Poisoned,
     UnknownEpoch,
     UnknownValidator,
 }
diff --git a/validator_client/src/duties/mod.rs b/validator_client/src/duties/mod.rs
index 0e962053e1..9fce1a3536 100644
--- a/validator_client/src/duties/mod.rs
+++ b/validator_client/src/duties/mod.rs
@@ -82,7 +82,8 @@ impl<U: BeaconNode> DutiesManager<U> {
                 info!(log, "Duties changed (potential re-org)"; "epoch" => epoch, "duties" => format!("{:?}", duties))
             }
             Ok(UpdateOutcome::NewDuties(epoch, duties)) => {
-                info!(log, "New duties obtained"; "epoch" => epoch, "duties" => format!("{:?}", duties))
+                info!(log, "New duties obtained"; "epoch" => epoch);
+                print_duties(&log, duties);
             }
         };
         Ok(Async::Ready(()))
@@ -126,13 +127,22 @@ impl<T> From<std::sync::PoisonError<T>> for Error {
 impl From<EpochDutiesMapError> for Error {
     fn from(e: EpochDutiesMapError) -> Error {
         match e {
-            EpochDutiesMapError::Poisoned => Error::EpochMapPoisoned,
             EpochDutiesMapError::UnknownEpoch => Error::UnknownEpoch,
             EpochDutiesMapError::UnknownValidator => Error::UnknownValidator,
         }
     }
 }
 
+fn print_duties(log: &slog::Logger, duties: EpochDuties) {
+    for (pk, duty) in duties.iter() {
+        if let Some(display_duty) = duty {
+            info!(log, "Validator: {}",pk; "Duty" => format!("{}",display_duty));
+        } else {
+            info!(log, "Validator: {}",pk; "Duty" => "None");
+        }
+    }
+}
+
 /* TODO: Modify tests for new Duties Manager form
 #[cfg(test)]
 mod tests {