Merge branch 'develop' into fix-key-active-tests

validator/client/runner_test.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"sync"
 	"testing"
 	"time"
 
@@ -205,12 +206,24 @@ func TestKeyReload_ActiveKey(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	km := &mockKeymanager{}
 	v := &testutil.FakeValidator{Km: km}
-	go func() {
-		km.SimulateAccountChanges([][fieldparams.BLSPubkeyLength]byte{testutil.ActiveKey})
 
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	go func() {
+		defer wg.Done()
+		time.Sleep(time.Second)
+		for {
+			if km.accountsChangedFeed != nil {
+				km.SimulateAccountChanges([][fieldparams.BLSPubkeyLength]byte{testutil.ActiveKey})
+
+				break
+			}
+		}
 		cancel()
 	}()
 	run(ctx, v)
+	wg.Wait()
 	assert.Equal(t, true, v.HandleKeyReloadCalled)
 	// We expect that WaitForActivation will only be called once,
 	// at the very beginning, and not after account changes.
@@ -223,12 +236,21 @@ func TestKeyReload_NoActiveKey(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	km := &mockKeymanager{}
 	v := &testutil.FakeValidator{Km: km}
+	var wg sync.WaitGroup
+	wg.Add(1)
 	go func() {
-		km.SimulateAccountChanges(make([][fieldparams.BLSPubkeyLength]byte, 0))
-
+		defer wg.Done()
+		time.Sleep(time.Second)
+		for {
+			if km.accountsChangedFeed != nil {
+				km.SimulateAccountChanges(make([][fieldparams.BLSPubkeyLength]byte, 0))
+				break
+			}
+		}
 		cancel()
 	}()
 	run(ctx, v)
+	wg.Wait()
 	assert.Equal(t, true, v.HandleKeyReloadCalled)
 	assert.Equal(t, 2, v.WaitForActivationCalled)
 }

validator/client/validator_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"math"
+	"sort"
 	"strings"
 	"sync"
 	"testing"
@@ -71,12 +72,11 @@ type mockKeymanager struct {
 	lock                sync.RWMutex
 	keysMap             map[[fieldparams.BLSPubkeyLength]byte]bls.SecretKey
 	fetchNoKeys         bool
+	EventFeedSetCh      chan bool
 	accountsChangedFeed *event.Feed
 }
 
 func (m *mockKeymanager) FetchValidatingPublicKeys(_ context.Context) ([][fieldparams.BLSPubkeyLength]byte, error) {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
 	keys := make([][fieldparams.BLSPubkeyLength]byte, 0)
 	if m.fetchNoKeys {
 		m.fetchNoKeys = false
@@ -85,6 +85,10 @@ func (m *mockKeymanager) FetchValidatingPublicKeys(_ context.Context) ([][fieldp
 	for pubKey := range m.keysMap {
 		keys = append(keys, pubKey)
 	}
+	comparator := func(i, j int) bool {
+		return string(keys[i][:]) < string(keys[j][:])
+	}
+	sort.Slice(keys, comparator)
 	return keys, nil
 }