diff --git a/operator/duties/attester.go b/operator/duties/attester.go index c48291e309..578c558cc5 100644 --- a/operator/duties/attester.go +++ b/operator/duties/attester.go @@ -177,7 +177,7 @@ func (h *AttesterHandler) processExecution(ctx context.Context, epoch phase0.Epo } } - h.dutiesExecutor.ExecuteDuties(ctx, h.logger, toExecute) + h.dutiesExecutor.ExecuteDuties(ctx, toExecute) } func (h *AttesterHandler) fetchAndProcessDuties(ctx context.Context, epoch phase0.Epoch) error { diff --git a/operator/duties/proposer.go b/operator/duties/proposer.go index c57488adde..23c24ec0a2 100644 --- a/operator/duties/proposer.go +++ b/operator/duties/proposer.go @@ -144,7 +144,7 @@ func (h *ProposerHandler) processExecution(ctx context.Context, epoch phase0.Epo toExecute = append(toExecute, h.toSpecDuty(d, spectypes.BNRoleProposer)) } } - h.dutiesExecutor.ExecuteDuties(ctx, h.logger, toExecute) + h.dutiesExecutor.ExecuteDuties(ctx, toExecute) } func (h *ProposerHandler) fetchAndProcessDuties(ctx context.Context, epoch phase0.Epoch) error { diff --git a/operator/duties/scheduler.go b/operator/duties/scheduler.go index 579928d0f3..e2ee312932 100644 --- a/operator/duties/scheduler.go +++ b/operator/duties/scheduler.go @@ -38,7 +38,7 @@ const ( // DutiesExecutor is an interface for executing duties. type DutiesExecutor interface { - ExecuteDuties(ctx context.Context, logger *zap.Logger, duties []*spectypes.ValidatorDuty) + ExecuteDuties(ctx context.Context, duties []*spectypes.ValidatorDuty) ExecuteCommitteeDuties(ctx context.Context, duties committeeDutiesMap) } @@ -359,7 +359,7 @@ func (s *Scheduler) HandleHeadEvent() func(event *eth2apiv1.Event) { } // ExecuteDuties tries to execute the given duties -func (s *Scheduler) ExecuteDuties(ctx context.Context, logger *zap.Logger, duties []*spectypes.ValidatorDuty) { +func (s *Scheduler) ExecuteDuties(ctx context.Context, duties []*spectypes.ValidatorDuty) { for _, duty := range duties { duty := duty logger := s.loggerWithDutyContext(duty) diff --git a/operator/duties/scheduler_mock.go b/operator/duties/scheduler_mock.go index a63a62b493..b9d8905965 100644 --- a/operator/duties/scheduler_mock.go +++ b/operator/duties/scheduler_mock.go @@ -61,15 +61,15 @@ func (mr *MockDutiesExecutorMockRecorder) ExecuteCommitteeDuties(ctx, duties any } // ExecuteDuties mocks base method. -func (m *MockDutiesExecutor) ExecuteDuties(ctx context.Context, logger *zap.Logger, duties []*types0.ValidatorDuty) { +func (m *MockDutiesExecutor) ExecuteDuties(ctx context.Context, duties []*types0.ValidatorDuty) { m.ctrl.T.Helper() - m.ctrl.Call(m, "ExecuteDuties", ctx, logger, duties) + m.ctrl.Call(m, "ExecuteDuties", ctx, duties) } // ExecuteDuties indicates an expected call of ExecuteDuties. -func (mr *MockDutiesExecutorMockRecorder) ExecuteDuties(ctx, logger, duties any) *gomock.Call { +func (mr *MockDutiesExecutorMockRecorder) ExecuteDuties(ctx, duties any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteDuties", reflect.TypeOf((*MockDutiesExecutor)(nil).ExecuteDuties), ctx, logger, duties) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteDuties", reflect.TypeOf((*MockDutiesExecutor)(nil).ExecuteDuties), ctx, duties) } // MockDutyExecutor is a mock of DutyExecutor interface. diff --git a/operator/duties/sync_committee.go b/operator/duties/sync_committee.go index 75e7bace63..fcfa414aad 100644 --- a/operator/duties/sync_committee.go +++ b/operator/duties/sync_committee.go @@ -175,7 +175,7 @@ func (h *SyncCommitteeHandler) processExecution(ctx context.Context, period uint } } - h.dutiesExecutor.ExecuteDuties(ctx, h.logger, toExecute) + h.dutiesExecutor.ExecuteDuties(ctx, toExecute) } func (h *SyncCommitteeHandler) fetchAndProcessDuties(ctx context.Context, period uint64, waitForInitial bool) error { diff --git a/operator/duties/validatorregistration.go b/operator/duties/validatorregistration.go index 9757d0eceb..25ed20995e 100644 --- a/operator/duties/validatorregistration.go +++ b/operator/duties/validatorregistration.go @@ -55,7 +55,7 @@ func (h *ValidatorRegistrationHandler) HandleDuties(ctx context.Context) { pk := phase0.BLSPubKey{} copy(pk[:], share.ValidatorPubKey[:]) - h.dutiesExecutor.ExecuteDuties(ctx, h.logger, []*spectypes.ValidatorDuty{{ + h.dutiesExecutor.ExecuteDuties(ctx, []*spectypes.ValidatorDuty{{ Type: spectypes.BNRoleValidatorRegistration, ValidatorIndex: share.ValidatorIndex, PubKey: pk, diff --git a/operator/duties/voluntary_exit.go b/operator/duties/voluntary_exit.go index 470e5718bc..4ab9448515 100644 --- a/operator/duties/voluntary_exit.go +++ b/operator/duties/voluntary_exit.go @@ -117,7 +117,7 @@ func (h *VoluntaryExitHandler) processExecution(ctx context.Context, slot phase0 h.duties.RemoveSlot(slot - phase0.Slot(h.network.SlotsPerEpoch())) if dutyCount := len(dutiesForExecution); dutyCount != 0 { - h.dutiesExecutor.ExecuteDuties(ctx, h.logger, dutiesForExecution) + h.dutiesExecutor.ExecuteDuties(ctx, dutiesForExecution) h.logger.Debug("executed voluntary exit duties", fields.Slot(slot), fields.Count(dutyCount))