Refactor validator roles into an array

proto/beacon/rpc/v1/services.proto

@@ -92,7 +92,6 @@ message ChainStartResponse {
      UNKNOWN = 0;
      ATTESTER = 1;
      PROPOSER = 2;
-     BOTH = 3;
 }
 
 message ValidatorIndexRequest {

validator/client/fake_validator_test.go

@@ -22,7 +22,7 @@ type fakeValidator struct {
 	UpdateAssignmentsRet             error
 	RoleAtCalled                     bool
 	RoleAtArg1                       uint64
-	RoleAtRet                        pb.ValidatorRole
+	RolesAtRet                       []pb.ValidatorRole
 	AttestToBlockHeadCalled          bool
 	AttestToBlockHeadArg1            uint64
 	ProposeBlockCalled               bool
@@ -77,11 +77,11 @@ func (fv *fakeValidator) LogValidatorGainsAndLosses(_ context.Context, slot uint
 	return nil
 }
 
-func (fv *fakeValidator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole {
+func (fv *fakeValidator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
 	fv.RoleAtCalled = true
 	fv.RoleAtArg1 = slot
-	vr := make(map[[48]byte]pb.ValidatorRole)
-	vr[[48]byte{1}] = fv.RoleAtRet
+	vr := make(map[[48]byte][]pb.ValidatorRole)
+	vr[[48]byte{1}] = fv.RolesAtRet
 	return vr
 }
 

validator/client/runner.go

@@ -2,14 +2,11 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1"
-	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -26,7 +23,7 @@ type Validator interface {
 	SlotDeadline(slot uint64) time.Time
 	LogValidatorGainsAndLosses(ctx context.Context, slot uint64) error
 	UpdateAssignments(ctx context.Context, slot uint64) error
-	RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole // validator pubKey -> role
+	RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole // validator pubKey -> roles
 	SubmitAttestation(ctx context.Context, slot uint64, pubKey [48]byte)
 	ProposeBlock(ctx context.Context, slot uint64, pubKey [48]byte)
 }
@@ -85,28 +82,24 @@ func run(ctx context.Context, v Validator) {
 			}
 
 			var wg sync.WaitGroup
-			for id, role := range v.RolesAt(slot) {
+			for id, roles := range v.RolesAt(slot) {
 				wg.Add(1)
-				go func(role pb.ValidatorRole, id [48]byte) {
-					log := log.WithFields(logrus.Fields{
-						"pubKey": fmt.Sprintf("%#x", bytesutil.Trunc(id[:])),
-						"role":   role,
-					})
-					switch role {
-					case pb.ValidatorRole_BOTH:
-						go v.SubmitAttestation(slotCtx, slot, id)
-						v.ProposeBlock(slotCtx, slot, id)
-					case pb.ValidatorRole_ATTESTER:
-						v.SubmitAttestation(slotCtx, slot, id)
-					case pb.ValidatorRole_PROPOSER:
-						v.ProposeBlock(slotCtx, slot, id)
-					case pb.ValidatorRole_UNKNOWN:
-						log.Debug("No active role, doing nothing")
-					default:
-						log.Warn("Unhandled role")
+				go func(roles []pb.ValidatorRole, id [48]byte) {
+
+					for _, role := range roles {
+						switch role {
+						case pb.ValidatorRole_ATTESTER:
+							go v.SubmitAttestation(slotCtx, slot, id)
+						case pb.ValidatorRole_PROPOSER:
+							go v.ProposeBlock(slotCtx, slot, id)
+						case pb.ValidatorRole_UNKNOWN:
+							log.Debug("No active roles, doing nothing")
+						default:
+							log.Warnf("Unhandled role %v", role)
+						}
 					}
 
-				}(role, id)
+				}(roles, id)
 			}
 			// Wait for all processes to complete, then report span complete.
 			go func() {

validator/client/runner_test.go

@@ -114,7 +114,7 @@ func TestAttests_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_ATTESTER
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_ATTESTER}
 	go func() {
 		ticker <- slot
 
@@ -138,7 +138,7 @@ func TestProposes_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_PROPOSER
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_PROPOSER}
 	go func() {
 		ticker <- slot
 
@@ -162,7 +162,7 @@ func TestBothProposesAndAttests_NextSlot(t *testing.T) {
 	slot := uint64(55)
 	ticker := make(chan uint64)
 	v.NextSlotRet = ticker
-	v.RoleAtRet = pb.ValidatorRole_BOTH
+	v.RolesAtRet = []pb.ValidatorRole{pb.ValidatorRole_ATTESTER, pb.ValidatorRole_PROPOSER}
 	go func() {
 		ticker <- slot
 

validator/client/validator.go

@@ -259,25 +259,27 @@ func (v *validator) UpdateAssignments(ctx context.Context, slot uint64) error {
 // RolesAt slot returns the validator roles at the given slot. Returns nil if the
 // validator is known to not have a roles at the at slot. Returns UNKNOWN if the
 // validator assignments are unknown. Otherwise returns a valid ValidatorRole map.
-func (v *validator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole {
-	rolesAt := make(map[[48]byte]pb.ValidatorRole)
+func (v *validator) RolesAt(slot uint64) map[[48]byte][]pb.ValidatorRole {
+	rolesAt := make(map[[48]byte][]pb.ValidatorRole)
 	for _, assignment := range v.assignments.ValidatorAssignment {
-		var role pb.ValidatorRole
-		switch {
-		case assignment == nil:
-			role = pb.ValidatorRole_UNKNOWN
-		case assignment.ProposerSlot == slot && assignment.AttesterSlot == slot:
-			role = pb.ValidatorRole_BOTH
-		case assignment.AttesterSlot == slot:
-			role = pb.ValidatorRole_ATTESTER
-		case assignment.ProposerSlot == slot:
-			role = pb.ValidatorRole_PROPOSER
-		default:
-			role = pb.ValidatorRole_UNKNOWN
+		var roles []pb.ValidatorRole
+
+		if assignment == nil {
+			continue
+		}
+		if assignment.ProposerSlot == slot {
+			roles = append(roles, pb.ValidatorRole_PROPOSER)
 		}
+		if assignment.AttesterSlot == slot {
+			roles = append(roles, pb.ValidatorRole_ATTESTER)
+		}
+		if len(roles) == 0 {
+			roles = append(roles, pb.ValidatorRole_UNKNOWN)
+		}
+
 		var pubKey [48]byte
 		copy(pubKey[:], assignment.PublicKey)
-		rolesAt[pubKey] = role
+		rolesAt[pubKey] = roles
 	}
 	return rolesAt
 }

validator/client/validator_test.go

@@ -579,16 +579,19 @@ func TestRolesAt_OK(t *testing.T) {
 		},
 	}
 	roleMap := v.RolesAt(1)
-	if roleMap[[48]byte{0x01}] != pb.ValidatorRole_ATTESTER {
+	if roleMap[[48]byte{0x01}][0] != pb.ValidatorRole_ATTESTER {
 		t.Errorf("Unexpected validator role. want: ValidatorRole_PROPOSER")
 	}
-	if roleMap[[48]byte{0x02}] != pb.ValidatorRole_PROPOSER {
+	if roleMap[[48]byte{0x02}][0] != pb.ValidatorRole_PROPOSER {
 		t.Errorf("Unexpected validator role. want: ValidatorRole_ATTESTER")
 	}
-	if roleMap[[48]byte{0x03}] != pb.ValidatorRole_UNKNOWN {
+	if roleMap[[48]byte{0x03}][0] != pb.ValidatorRole_UNKNOWN {
 		t.Errorf("Unexpected validator role. want: UNKNOWN")
 	}
-	if roleMap[[48]byte{0x04}] != pb.ValidatorRole_BOTH {
-		t.Errorf("Unexpected validator role. want: BOTH")
+	if roleMap[[48]byte{0x04}][0] != pb.ValidatorRole_PROPOSER {
+		t.Errorf("Unexpected validator role. want: ValidatorRole_PROPOSER")
+	}
+	if roleMap[[48]byte{0x04}][1] != pb.ValidatorRole_ATTESTER {
+		t.Errorf("Unexpected validator role. want: ValidatorRole_ATTESTER")
 	}
 }