Merge branch 'refs/heads/alan/no-fork' into alan/test-message-validation

operator/duties/base_handler.go

@@ -3,14 +3,14 @@ package duties
 import (
 	"context"
 
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/networkconfig"
 	"github.com/ssvlabs/ssv/operator/slotticker"
 )
 
-//go:generate mockgen -package=mocks -destination=./mocks/base_handler.go -source=./base_handler.go
+//go:generate mockgen -package=duties -destination=./base_handler_mock.go -source=./base_handler.go
 
 // ExecuteDutiesFunc is a non-blocking functions which executes the given duties.
 type ExecuteDutiesFunc func(logger *zap.Logger, duties []*spectypes.BeaconDuty)

operator/duties/scheduler_test.go

@@ -9,11 +9,11 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/prysmaticlabs/prysm/v4/async/event"
 	"github.com/sourcegraph/conc/pool"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 	"go.uber.org/zap"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/logging"
 	"github.com/ssvlabs/ssv/networkconfig"
 	"github.com/ssvlabs/ssv/operator/duties/mocks"
@@ -108,7 +108,6 @@ func setupSchedulerAndMocks(t *testing.T, handler dutyHandler, currentSlot *Slot
 			mockSlotService.Subscribe(ticker.Subscribe())
 			return ticker
 		},
-		BuilderProposals: false,
 	}
 
 	s := NewScheduler(opts)
@@ -256,8 +255,8 @@ func TestScheduler_Run(t *testing.T) {
 	mockValidatorProvider := mocks.NewMockValidatorProvider(ctrl)
 	mockTicker := mockslotticker.NewMockSlotTicker(ctrl)
 	// create multiple mock duty handlers
-	mockDutyHandler1 := mocks.NewMockdutyHandler(ctrl)
-	mockDutyHandler2 := mocks.NewMockdutyHandler(ctrl)
+	mockDutyHandler1 := NewMockdutyHandler(ctrl)
+	mockDutyHandler2 := NewMockdutyHandler(ctrl)
 
 	mockDutyHandler1.EXPECT().HandleInitialDuties(gomock.Any()).AnyTimes()
 	mockDutyHandler2.EXPECT().HandleInitialDuties(gomock.Any()).AnyTimes()
@@ -267,7 +266,6 @@ func TestScheduler_Run(t *testing.T) {
 		BeaconNode:        mockBeaconNode,
 		Network:           networkconfig.TestNetwork,
 		ValidatorProvider: mockValidatorProvider,
-		BuilderProposals:  false,
 		SlotTickerProvider: func() slotticker.SlotTicker {
 			return mockTicker
 		},
@@ -282,13 +280,13 @@ func TestScheduler_Run(t *testing.T) {
 
 	// setup mock duty handler expectations
 	for _, mockDutyHandler := range s.handlers {
-		mockDutyHandler.(*mocks.MockdutyHandler).EXPECT().Setup(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
-		mockDutyHandler.(*mocks.MockdutyHandler).EXPECT().HandleDuties(gomock.Any()).
+		mockDutyHandler.(*MockdutyHandler).EXPECT().Setup(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
+		mockDutyHandler.(*MockdutyHandler).EXPECT().HandleDuties(gomock.Any()).
 			DoAndReturn(func(ctx context.Context) {
 				<-ctx.Done()
 			}).
 			Times(1)
-		mockDutyHandler.(*mocks.MockdutyHandler).EXPECT().Name().Times(1)
+		mockDutyHandler.(*MockdutyHandler).EXPECT().Name().Times(1)
 	}
 
 	require.NoError(t, s.Start(ctx, logger))
@@ -320,8 +318,6 @@ func TestScheduler_Regression_IndicesChangeStuck(t *testing.T) {
 			return mockTicker
 		},
 		IndicesChg: make(chan struct{}),
-
-		BuilderProposals: true,
 	}
 
 	s := NewScheduler(opts)

operator/duties/voluntary_exit_test.go

@@ -9,10 +9,10 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/trie"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"github.com/ssvlabs/ssv/operator/duties/mocks"
 	mocknetwork "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/mocks"
 )