From 9029d63ef38437b388a6982e81a94c85da769ed5 Mon Sep 17 00:00:00 2001
From: rauljordan <raul@prysmaticlabs.com>
Date: Fri, 1 May 2020 10:24:49 -0500
Subject: [PATCH] tests pass

---
 beacon-chain/rpc/validator/BUILD.bazel    |  2 --
 beacon-chain/rpc/validator/assignments.go | 35 +++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/beacon-chain/rpc/validator/BUILD.bazel b/beacon-chain/rpc/validator/BUILD.bazel
index 85584232dab0..6f80649e3c09 100644
--- a/beacon-chain/rpc/validator/BUILD.bazel
+++ b/beacon-chain/rpc/validator/BUILD.bazel
@@ -41,7 +41,6 @@ go_library(
         "//shared/featureconfig:go_default_library",
         "//shared/hashutil:go_default_library",
         "//shared/params:go_default_library",
-        "//shared/slotutil:go_default_library",
         "//shared/traceutil:go_default_library",
         "//shared/trieutil:go_default_library",
         "@com_github_gogo_protobuf//types:go_default_library",
@@ -96,7 +95,6 @@ go_test(
         "//shared/hashutil:go_default_library",
         "//shared/params:go_default_library",
         "//shared/roughtime:go_default_library",
-        "//shared/slotutil/testing:go_default_library",
         "//shared/testutil:go_default_library",
         "//shared/trieutil:go_default_library",
         "@com_github_gogo_protobuf//proto:go_default_library",
diff --git a/beacon-chain/rpc/validator/assignments.go b/beacon-chain/rpc/validator/assignments.go
index 417b9a4c5326..b8991578a0ee 100644
--- a/beacon-chain/rpc/validator/assignments.go
+++ b/beacon-chain/rpc/validator/assignments.go
@@ -4,16 +4,15 @@ import (
 	"context"
 
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/feed"
 	statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/prysmaticlabs/prysm/shared/slotutil"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 // GetDuties returns the duties assigned to a list of validators specified
@@ -47,19 +46,8 @@ func (vs *Server) StreamDuties(req *ethpb.DutiesRequest, stream ethpb.BeaconNode
 	stateSub := vs.StateNotifier.StateFeed().Subscribe(stateChannel)
 	defer stateSub.Unsubscribe()
 
-	secondsPerEpoch := params.BeaconConfig().SecondsPerSlot * params.BeaconConfig().SlotsPerEpoch
-	epochTicker := slotutil.GetSlotTicker(vs.GenesisTimeFetcher.GenesisTime(), secondsPerEpoch)
 	for {
 		select {
-		// Ticks every epoch to submit assignments to connected validator clients.
-		case <-epochTicker.C():
-			res, err := vs.duties(stream.Context(), req)
-			if err != nil {
-				return status.Errorf(codes.Internal, "Could not compute validator duties: %v", err)
-			}
-			if err := stream.Send(res); err != nil {
-				return status.Errorf(codes.Internal, "Could not send response over stream: %v", err)
-			}
 		case ev := <-stateChannel:
 			// If a reorg occurred, we recompute duties for the connected validator clients
 			// and send another response over the server stream right away.
@@ -83,6 +71,23 @@ func (vs *Server) StreamDuties(req *ethpb.DutiesRequest, stream ethpb.BeaconNode
 					return status.Errorf(codes.Internal, "Could not send response over stream: %v", err)
 				}
 			}
+			if ev.Type == statefeed.BlockProcessed {
+				data, ok := ev.Data.(*statefeed.BlockProcessedData)
+				if !ok {
+					return status.Errorf(codes.Internal, "Received incorrect data type over reorg feed: %v", data)
+				}
+				// If this is not a new epoch, we do not update duties.
+				if data != nil && data.Slot%params.BeaconConfig().SlotsPerEpoch != 0 {
+					continue
+				}
+				res, err := vs.duties(stream.Context(), req)
+				if err != nil {
+					return status.Errorf(codes.Internal, "Could not compute validator duties: %v", err)
+				}
+				if err := stream.Send(res); err != nil {
+					return status.Errorf(codes.Internal, "Could not send response over stream: %v", err)
+				}
+			}
 		case <-stream.Context().Done():
 			return status.Error(codes.Canceled, "Stream context canceled")
 		case <-vs.Ctx.Done():