From b51d2d728225921b64f40914c4b378f8edf7e034 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Wed, 27 Nov 2019 13:11:52 +1100
Subject: [PATCH] Tidy code in rest_api

---
 beacon_node/rest_api/src/validator.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/beacon_node/rest_api/src/validator.rs b/beacon_node/rest_api/src/validator.rs
index 4f01ec660f..d9e915d202 100644
--- a/beacon_node/rest_api/src/validator.rs
+++ b/beacon_node/rest_api/src/validator.rs
@@ -93,11 +93,9 @@ fn return_validator_duties<T: BeaconChainTypes>(
     epoch: Epoch,
     validator_pubkeys: Vec<PublicKey>,
 ) -> Result<Vec<ValidatorDuty>, ApiError> {
-    let head_state_slot = beacon_chain.head().beacon_state.slot;
-    let head_epoch = head_state_slot.current_epoch();
+    let head_epoch = beacon_chain.head().beacon_state.current_epoch();
 
-    let relative_epoch = RelativeEpoch::from_epoch(head_epoch, epoch);
-    let mut state = if relative_epoch.is_err() {
+    let mut state = if RelativeEpoch::from_epoch(head_epoch, epoch).is_err() {
         beacon_chain.head().beacon_state
     } else {
         beacon_chain
@@ -107,6 +105,9 @@ fn return_validator_duties<T: BeaconChainTypes>(
             })?
     };
 
+    let relative_epoch = RelativeEpoch::from_epoch(state.current_epoch(), epoch)
+        .map_err(|_| ApiError::ServerError(String::from("Loaded state is in the wrong epoch")))?;
+
     state
         .build_committee_cache(relative_epoch, &beacon_chain.spec)
         .map_err(|e| ApiError::ServerError(format!("Unable to build committee cache: {:?}", e)))?;