From 33e266388ffae15708f48336639886f37fb6bcac Mon Sep 17 00:00:00 2001
From: Preston Van Loon <preston@prysmaticlabs.com>
Date: Thu, 21 Jan 2021 14:22:05 -0800
Subject: [PATCH] GetDuties: Refactor assignment status to deduplicate status
 computation (#8313)

---
 beacon-chain/rpc/validator/assignments.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/beacon-chain/rpc/validator/assignments.go b/beacon-chain/rpc/validator/assignments.go
index 4725089e16c..29691b98e38 100644
--- a/beacon-chain/rpc/validator/assignments.go
+++ b/beacon-chain/rpc/validator/assignments.go
@@ -155,13 +155,15 @@ func (vs *Server) duties(ctx context.Context, req *ethpb.DutiesRequest) (*ethpb.
 		}
 		idx, ok := s.ValidatorIndexByPubkey(bytesutil.ToBytes48(pubKey))
 		if ok {
+			status := assignmentStatus(s, idx)
+
 			assignment.ValidatorIndex = idx
-			assignment.Status = assignmentStatus(s, idx)
+			assignment.Status = status
 			assignment.ProposerSlots = proposerIndexToSlots[idx]
 
 			// The next epoch has no lookup for proposer indexes.
 			nextAssignment.ValidatorIndex = idx
-			nextAssignment.Status = assignmentStatus(s, idx)
+			nextAssignment.Status = status
 
 			ca, ok := committeeAssignments[idx]
 			if ok {