remove logger from ExecuteDuties

ssvlabs · Jan 21, 2025 · 3ee7692 · 3ee7692
1 parent 4952294
commit 3ee7692
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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))
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	h.dutiesExecutor.ExecuteDuties(ctx, h.logger, toExecute)
+    	h.dutiesExecutor.ExecuteDuties(ctx, toExecute)
     }
     func (h *AttesterHandler) fetchAndProcessDuties(ctx context.Context, epoch phase0.Epoch) error {
@@ Expand Down @@