runners: refactoring to simplify & future-proof

cli/operator/node.go

@@ -1066,7 +1066,7 @@ func syncContractEvents(
 	ctx context.Context,
 	logger *zap.Logger,
 	executionClient executionclient.Provider,
-	validatorCtrl validator.Controller,
+	validatorCtrl *validator.Controller,
 	networkConfig *networkconfig.Network,
 	nodeStorage operatorstorage.Storage,
 	operatorDataStore operatordatastore.OperatorDataStore,

eth/ethtest/common_test.go

@@ -15,12 +15,12 @@ import (
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap/zaptest"
 
+	"github.com/ssvlabs/ssv/eth/eventhandler/mocks"
 	"github.com/ssvlabs/ssv/eth/eventsyncer"
 	"github.com/ssvlabs/ssv/eth/executionclient"
 	"github.com/ssvlabs/ssv/eth/simulator"
 	"github.com/ssvlabs/ssv/eth/simulator/simcontract"
 	"github.com/ssvlabs/ssv/operator/storage"
-	"github.com/ssvlabs/ssv/operator/validator/mocks"
 )
 
 type CommonTestInput struct {
@@ -62,7 +62,7 @@ type TestEnv struct {
 	execClient     *executionclient.ExecutionClient
 	rpcServer      *rpc.Server
 	httpSrv        *httptest.Server
-	validatorCtrl  *mocks.MockController
+	taskExecutor   *mocks.MockTaskExecutor
 	mockCtrl       *gomock.Controller
 	followDistance *uint64
 }
@@ -116,15 +116,15 @@ func (e *TestEnv) setup(
 		}
 	}
 
-	eh, validatorCtrl, mockCtrl, nodeStorage, err := setupEventHandler(t, ctx, logger, ops[0], &testAddrAlice, true)
+	eh, taskExecutor, mockCtrl, nodeStorage, err := setupEventHandler(t, ctx, logger, ops[0], &testAddrAlice, true)
 	e.mockCtrl = mockCtrl
 	e.nodeStorage = nodeStorage
 
 	if err != nil {
 		return err
 	}
-	if validatorCtrl == nil {
-		return fmt.Errorf("validatorCtrl is empty")
+	if taskExecutor == nil {
+		return fmt.Errorf("taskExecutor is empty")
 	}
 
 	// Adding testAddresses to the genesis block mostly to specify some balances for them
@@ -196,7 +196,7 @@ func (e *TestEnv) setup(
 		eventsyncer.WithLogger(logger),
 	)
 
-	e.validatorCtrl = validatorCtrl
+	e.taskExecutor = taskExecutor
 	e.sim = sim
 	e.auth = auth
 	e.validators = validators

eth/ethtest/eth_e2e_test.go

@@ -60,7 +60,7 @@ func TestEthExecLayer(t *testing.T) {
 		validators    = testEnv.validators
 		eventSyncer   = testEnv.eventSyncer
 		shares        = testEnv.shares
-		validatorCtrl = testEnv.validatorCtrl
+		taskExecutor  = testEnv.taskExecutor
 	)
 
 	blockNum := uint64(0x1)
@@ -171,7 +171,7 @@ func TestEthExecLayer(t *testing.T) {
 
 		// Step 2: Exit validator
 		{
-			validatorCtrl.EXPECT().ExitValidator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+			taskExecutor.EXPECT().ExitValidator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 
 			shares := nodeStorage.Shares().List(nil)
 			require.Equal(t, 7, len(shares))
@@ -196,7 +196,7 @@ func TestEthExecLayer(t *testing.T) {
 
 		// Step 3: Remove validator
 		{
-			validatorCtrl.EXPECT().StopValidator(gomock.Any()).AnyTimes()
+			taskExecutor.EXPECT().StopValidator(gomock.Any()).AnyTimes()
 
 			shares := nodeStorage.Shares().List(nil)
 			require.Equal(t, 7, len(shares))
@@ -228,7 +228,7 @@ func TestEthExecLayer(t *testing.T) {
 
 		// Step 4 Liquidate Cluster
 		{
-			validatorCtrl.EXPECT().LiquidateCluster(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+			taskExecutor.EXPECT().LiquidateCluster(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 
 			clusterLiquidate := NewTestClusterLiquidatedInput(common)
 			clusterLiquidate.prepare([]*ClusterLiquidatedEventInput{
@@ -258,7 +258,7 @@ func TestEthExecLayer(t *testing.T) {
 
 		// Step 5 Reactivate Cluster
 		{
-			validatorCtrl.EXPECT().ReactivateCluster(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
+			taskExecutor.EXPECT().ReactivateCluster(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 
 			clusterID := ssvtypes.ComputeClusterIDHash(testAddrAlice, []uint64{1, 2, 3, 4})
 
@@ -310,7 +310,7 @@ func TestEthExecLayer(t *testing.T) {
 
 		// Step 7 Update Fee Recipient
 		{
-			validatorCtrl.EXPECT().UpdateFeeRecipient(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
+			taskExecutor.EXPECT().UpdateFeeRecipient(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
 
 			setFeeRecipient := NewSetFeeRecipientAddressInput(common)
 			setFeeRecipient.prepare([]*SetFeeRecipientAddressEventInput{

eth/ethtest/utils_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ssvlabs/ssv/doppelganger"
 	"github.com/ssvlabs/ssv/eth/contract"
 	"github.com/ssvlabs/ssv/eth/eventhandler"
+	"github.com/ssvlabs/ssv/eth/eventhandler/mocks"
 	"github.com/ssvlabs/ssv/eth/eventparser"
 	"github.com/ssvlabs/ssv/eth/simulator"
 	"github.com/ssvlabs/ssv/exporter"
@@ -29,7 +30,6 @@ import (
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	operatorstorage "github.com/ssvlabs/ssv/operator/storage"
 	"github.com/ssvlabs/ssv/operator/validator"
-	"github.com/ssvlabs/ssv/operator/validator/mocks"
 	registrystorage "github.com/ssvlabs/ssv/registry/storage"
 	kv "github.com/ssvlabs/ssv/storage/badger"
 	"github.com/ssvlabs/ssv/storage/basedb"
@@ -152,7 +152,7 @@ func setupEventHandler(
 	operator *testOperator,
 	ownerAddress *ethcommon.Address,
 	useMockCtrl bool,
-) (*eventhandler.EventHandler, *mocks.MockController, *gomock.Controller, operatorstorage.Storage, error) {
+) (*eventhandler.EventHandler, *mocks.MockTaskExecutor, *gomock.Controller, operatorstorage.Storage, error) {
 	db, err := kv.NewInMemory(logger, basedb.Options{
 		Ctx: ctx,
 	})
@@ -180,14 +180,14 @@ func setupEventHandler(
 	dgHandler := doppelganger.NoOpHandler{}
 
 	if useMockCtrl {
-		validatorCtrl := mocks.NewMockController(ctrl)
+		tExecutor := mocks.NewMockTaskExecutor(ctrl)
 
 		parser := eventparser.New(contractFilterer)
 
 		eh, err := eventhandler.New(
 			nodeStorage,
 			parser,
-			validatorCtrl,
+			tExecutor,
 			testNetworkConfig,
 			operatorDataStore,
 			operator.privateKey,
@@ -201,7 +201,7 @@ func setupEventHandler(
 			return nil, nil, nil, nil, err
 		}
 
-		return eh, validatorCtrl, ctrl, nodeStorage, nil
+		return eh, tExecutor, ctrl, nodeStorage, nil
 	}
 
 	validatorCtrl := validator.NewController(logger, validator.ControllerOptions{

eth/eventhandler/event_handler.go

@@ -32,7 +32,7 @@ import (
 	"github.com/ssvlabs/ssv/storage/basedb"
 )
 
-// Event names
+// Ethereum SSV network contract event names.
 const (
 	OperatorAdded              = "OperatorAdded"
 	OperatorRemoved            = "OperatorRemoved"

eth/eventhandler/event_handler_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ssvlabs/ssv/beacon/goclient"
 	"github.com/ssvlabs/ssv/doppelganger"
 	"github.com/ssvlabs/ssv/eth/contract"
+	"github.com/ssvlabs/ssv/eth/eventhandler/mocks"
 	"github.com/ssvlabs/ssv/eth/eventparser"
 	"github.com/ssvlabs/ssv/eth/executionclient"
 	"github.com/ssvlabs/ssv/eth/simulator"
@@ -42,7 +43,6 @@ import (
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	operatorstorage "github.com/ssvlabs/ssv/operator/storage"
 	"github.com/ssvlabs/ssv/operator/validator"
-	"github.com/ssvlabs/ssv/operator/validator/mocks"
 	"github.com/ssvlabs/ssv/operator/validators"
 	registrystorage "github.com/ssvlabs/ssv/registry/storage"
 	kv "github.com/ssvlabs/ssv/storage/badger"
@@ -1359,7 +1359,7 @@ func setupEventHandler(
 	network *networkconfig.Network,
 	operator *testOperator,
 	useMockCtrl bool,
-) (*EventHandler, *mocks.MockController, error) {
+) (*EventHandler, *mocks.MockTaskExecutor, error) {
 	db, err := kv.NewInMemory(logger, basedb.Options{
 		Ctx: ctx,
 	})
@@ -1381,7 +1381,7 @@ func setupEventHandler(
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		validatorCtrl := mocks.NewMockController(ctrl)
+		tExecutor := mocks.NewMockTaskExecutor(ctrl)
 
 		contractFilterer, err := contract.NewContractFilterer(ethcommon.Address{}, nil)
 		require.NoError(t, err)
@@ -1391,7 +1391,7 @@ func setupEventHandler(
 		eh, err := New(
 			nodeStorage,
 			parser,
-			validatorCtrl,
+			tExecutor,
 			network,
 			operatorDataStore,
 			operator.privateKey,
@@ -1404,7 +1404,7 @@ func setupEventHandler(
 			return nil, nil, err
 		}
 
-		return eh, validatorCtrl, nil
+		return eh, tExecutor, nil
 	}
 
 	validatorCtrl := validator.NewController(logger, validator.ControllerOptions{

eth/eventhandler/mockgen.go

@@ -0,0 +1,8 @@
+package eventhandler
+
+//go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/task_executor.go github.com/ssvlabs/ssv/eth/eventhandler TaskExecutor
+
+// TaskExecutor adapts package-private interface for mockgen to generate properly capitalized mock-name.
+// The mockgen.go cannot be a mockgen_test.go for mockgen to work (if we want Golang to ignore mockgen.go file
+// during builds, we probably need to do it with build-tags).
+type TaskExecutor = taskExecutor

operator/node.go

@@ -36,7 +36,7 @@ type Options struct {
 	P2PNetwork          network.P2PNetwork
 	Context             context.Context
 	DB                  basedb.Database
-	ValidatorController validator.Controller
+	ValidatorController *validator.Controller
 	ValidatorStore      storage2.ValidatorStore
 	ValidatorOptions    validator.ControllerOptions `yaml:"ValidatorOptions"`
 	DutyStore           *dutystore.Store
@@ -48,7 +48,7 @@ type Node struct {
 	logger           *zap.Logger
 	network          *networkconfig.Network
 	context          context.Context
-	validatorsCtrl   validator.Controller
+	validatorsCtrl   *validator.Controller
 	validatorOptions validator.ControllerOptions
 	exporterOptions  exporter.Options
 	consensusClient  beaconprotocol.BeaconNode