refactor: update calculateMinBlobSlot & calculateStartSlot

Author: Monika-Bitfly

backend/pkg/blobindexer/blobindexer.go

@@ -144,14 +144,14 @@ func (bi *BlobIndexer) index() error {
 	}
 
 	// check if node still has last indexed blobs (if its outside the range defined by MAX_REQUEST_BLOCKS_DENEB), otherwise assume that the node has pruned too far and we would miss blobs
-	minBlobSlot := bi.calculateMinBlobSlot(spec, headHeader)
+	minBlobSlot := calculateMinBlobSlot(spec, headHeader)
 
 	// check if node has pruned too far
 	if err := bi.checkNodePruning(minBlobSlot, status); err != nil {
 		return err
 	}
 
-	startSlot, denebForkSlot := bi.calculateStartSlot(status, spec)
+	startSlot, denebForkSlot := calculateStartSlot(status, spec)
 	if headHeader.Data.Header.Message.Slot <= startSlot {
 		return fmt.Errorf("headHeader.Data.Header.Message.Slot <= startSlot: %v < %v (denebForkEpoch: %v, denebForkSlot: %v, slotsPerEpoch: %v)", headHeader.Data.Header.Message.Slot, startSlot, utils.Config.Chain.ClConfig.DenebForkEpoch, denebForkSlot, utils.Config.Chain.ClConfig.SlotsPerEpoch)
 	}
@@ -368,19 +368,6 @@ func (bi *BlobIndexer) shouldSkipBlobIndexing(status *BlobIndexerStatus) bool {
 		status.LastUpdate.After(time.Now().Add(-waitForOtherBlobIndexerDuration))
 }
 
-func (bi *BlobIndexer) calculateMinBlobSlot(spec *constypes.StandardSpecResponse, headHeader *constypes.StandardBeaconHeaderResponse) uint64 {
-	minBlobSlotRange := *spec.Data.MinEpochsForBlobSidecarsRequests * uint64(spec.Data.SlotsPerEpoch)
-	minBlobSlot := uint64(0)
-	if headHeader.Data.Header.Message.Slot > minBlobSlotRange {
-		minBlobSlot = headHeader.Data.Header.Message.Slot - minBlobSlotRange
-	}
-	pruneMarginSlotRange := utils.Config.BlobIndexer.PruneMarginEpochs * uint64(spec.Data.SlotsPerEpoch)
-	if minBlobSlot > pruneMarginSlotRange {
-		minBlobSlot = minBlobSlot - pruneMarginSlotRange
-	}
-	return minBlobSlot
-}
-
 func (bi *BlobIndexer) checkNodePruning(minBlobSlot uint64, status *BlobIndexerStatus) error {
 	if status.LastIndexedFinalizedSlot < minBlobSlot && status.LastIndexedFinalizedBlobSlot > 0 {
 		bs, err := bi.cl.GetBlobSidecars(status.LastIndexedFinalizedBlobSlot)
@@ -394,15 +381,6 @@ func (bi *BlobIndexer) checkNodePruning(minBlobSlot uint64, status *BlobIndexerS
 	return nil
 }
 
-func (bi *BlobIndexer) calculateStartSlot(status *BlobIndexerStatus, spec *constypes.StandardSpecResponse) (uint64, uint64) {
-	denebForkSlot := *spec.Data.DenebForkEpoch * uint64(spec.Data.SlotsPerEpoch)
-	startSlot := status.LastIndexedFinalizedSlot + 1
-	if status.LastIndexedFinalizedSlot <= denebForkSlot {
-		startSlot = denebForkSlot
-	}
-	return startSlot, denebForkSlot
-}
-
 func (bi *BlobIndexer) indexBlobsInBatches(status *BlobIndexerStatus, headHeader, finalizedHeader *constypes.StandardBeaconHeaderResponse, startSlot uint64) error {
 	start := time.Now()
 	log.InfoWithFields(log.Fields{
@@ -493,6 +471,28 @@ func (bi *BlobIndexer) indexBlobsInBatches(status *BlobIndexerStatus, headHeader
 	return nil
 }
 
+func calculateMinBlobSlot(spec *constypes.StandardSpecResponse, headHeader *constypes.StandardBeaconHeaderResponse) uint64 {
+	minBlobSlotRange := *spec.Data.MinEpochsForBlobSidecarsRequests * uint64(spec.Data.SlotsPerEpoch)
+	minBlobSlot := uint64(0)
+	if headHeader.Data.Header.Message.Slot > minBlobSlotRange {
+		minBlobSlot = headHeader.Data.Header.Message.Slot - minBlobSlotRange
+	}
+	pruneMarginSlotRange := utils.Config.BlobIndexer.PruneMarginEpochs * uint64(spec.Data.SlotsPerEpoch)
+	if minBlobSlot > pruneMarginSlotRange {
+		minBlobSlot = minBlobSlot - pruneMarginSlotRange
+	}
+	return minBlobSlot
+}
+
+func calculateStartSlot(status *BlobIndexerStatus, spec *constypes.StandardSpecResponse) (uint64, uint64) {
+	denebForkSlot := *spec.Data.DenebForkEpoch * uint64(spec.Data.SlotsPerEpoch)
+	startSlot := status.LastIndexedFinalizedSlot + 1
+	if status.LastIndexedFinalizedSlot <= denebForkSlot {
+		startSlot = denebForkSlot
+	}
+	return startSlot, denebForkSlot
+}
+
 func reportBlobIndexerStatus() {
 	if !utils.Config.BlobIndexer.DisableStatusReports {
 		services.ReportStatus("blobindexer", "Running", nil)