From ea562595ed4e8b53385357b812236c0289e44ce2 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Fri, 30 Aug 2019 00:46:25 +1000
Subject: [PATCH] Fix bugs with gRPC API

---
 beacon_node/rpc/src/validator.rs | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/beacon_node/rpc/src/validator.rs b/beacon_node/rpc/src/validator.rs
index afe173318..7f33e0c3a 100644
--- a/beacon_node/rpc/src/validator.rs
+++ b/beacon_node/rpc/src/validator.rs
@@ -40,8 +40,8 @@ impl<T: BeaconChainTypes> ValidatorService for ValidatorServiceInstance<T> {
                 .map_err(move |e| warn!(log_clone, "failed to reply {:?}: {:?}", req, e));
             return ctx.spawn(f);
         };
-        let state_cow = if let Ok(state) = self.chain.state_at_slot(slot) {
-            state
+        let mut state = if let Ok(state) = self.chain.state_at_slot(slot) {
+            state.as_ref().clone()
         } else {
             let log_clone = self.log.clone();
             let f = sink
@@ -52,33 +52,16 @@ impl<T: BeaconChainTypes> ValidatorService for ValidatorServiceInstance<T> {
                 .map_err(move |e| warn!(log_clone, "failed to reply {:?}: {:?}", req, e));
             return ctx.spawn(f);
         };
-        let state = state_cow.as_ref();
 
-        let spec = &self.chain.spec;
+        let _ = state.build_all_caches(&self.chain.spec);
+
         let epoch = Epoch::from(req.get_epoch());
         let mut resp = GetDutiesResponse::new();
         let resp_validators = resp.mut_active_validators();
 
-        let relative_epoch =
-            match RelativeEpoch::from_epoch(state.slot.epoch(T::EthSpec::slots_per_epoch()), epoch)
-            {
-                Ok(v) => v,
-                Err(e) => {
-                    // incorrect epoch
-                    let log_clone = self.log.clone();
-                    let f = sink
-                        .fail(RpcStatus::new(
-                            RpcStatusCode::FailedPrecondition,
-                            Some(format!("Invalid epoch: {:?}", e)),
-                        ))
-                        .map_err(move |e| warn!(log_clone, "failed to reply {:?}: {:?}", req, e));
-                    return ctx.spawn(f);
-                }
-            };
-
         let validator_proposers: Result<Vec<usize>, _> = epoch
             .slot_iter(T::EthSpec::slots_per_epoch())
-            .map(|slot| state.get_beacon_proposer_index(slot, relative_epoch, &spec))
+            .map(|slot| self.chain.block_proposer(slot))
             .collect();
         let validator_proposers = match validator_proposers {
             Ok(v) => v,