NumRetries -> MaxNumRetries

Author: PatStiles

core/chainio/avs_subscriber.go

@@ -68,13 +68,13 @@ func (s *AvsSubscriber) SubscribeToNewTasksV2(newTaskCreatedChan chan *servicema
 	// Subscribe to new tasks
 	sub, err := SubscribeToNewTasksV2Retryable(&bind.WatchOpts{}, s.AvsContractBindings.ServiceManager, internalChannel, nil)
 	if err != nil {
-		s.logger.Error("Primary failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultNumRetries, "err", err)
+		s.logger.Error("Primary failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultMaxNumRetries, "err", err)
 		return nil, err
 	}
 
 	subFallback, err := SubscribeToNewTasksV2Retryable(&bind.WatchOpts{}, s.AvsContractBindings.ServiceManagerFallback, internalChannel, nil)
 	if err != nil {
-		s.logger.Error("Fallback failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultNumRetries, "err", err)
+		s.logger.Error("Fallback failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultMaxNumRetries, "err", err)
 		return nil, err
 	}
 	s.logger.Info("Subscribed to new AlignedLayer V2 tasks")

core/chainio/avs_writer.go

@@ -97,13 +97,13 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 
 	// Set Retry config for RespondToTaskV2
 	respondToTaskV2Config := retry.DefaultRetryConfig()
-	respondToTaskV2Config.NumRetries = 0
+	respondToTaskV2Config.MaxNumRetries = 0
 	respondToTaskV2Config.MaxElapsedTime = 0
 
 	// Set Retry config for WaitForTxRetryable
 	waitForTxConfig := retry.DefaultRetryConfig()
 	waitForTxConfig.MaxInterval = 2 * time.Second
-	waitForTxConfig.NumRetries = 0
+	waitForTxConfig.MaxNumRetries = 0
 	waitForTxConfig.MaxElapsedTime = timeToWaitBeforeBump
 
 	respondToTaskV2Func := func() (*types.Receipt, error) {

core/retry.go

@@ -30,7 +30,7 @@ const (
 	DefaultMaxElapsedTime              = 0 * time.Second  // Maximum time all retries may take. `0` corresponds to no limit on the time of the retries.
 	DefaultRandomizationFactor float64 = 0                // Randomization (Jitter) factor used to map retry interval to a range of values around the computed interval. In precise terms (random value in range [1 - randomizationfactor, 1 + randomizationfactor]). NOTE: This is set to 0 as we do not use jitter in Aligned.
 	DefaultMultiplier          float64 = 2                // Multiplier factor computed exponential retry interval is scaled by.
-	DefaultNumRetries          uint64  = 3                // Total number of retries attempted.
+	DefaultMaxNumRetries       uint64  = 3                // Total number of retries attempted.
 	ChainInitialInterval               = 12 * time.Second // Initial delay for retry interval for contract calls. Corresponds to 1 ethereum block.
 	ChainMaxInterval                   = 2 * time.Minute  // Maximum interval for an individual retry.
 )
@@ -41,7 +41,7 @@ type RetryConfig struct {
 	MaxElapsedTime      time.Duration // Maximum time all retries may take. `0` corresponds to no limit on the time of the retries.
 	RandomizationFactor float64
 	Multiplier          float64
-	NumRetries          uint64
+	MaxNumRetries       uint64
 }
 
 func DefaultRetryConfig() *RetryConfig {
@@ -51,7 +51,7 @@ func DefaultRetryConfig() *RetryConfig {
 		MaxElapsedTime:      DefaultMaxElapsedTime,
 		RandomizationFactor: DefaultRandomizationFactor,
 		Multiplier:          DefaultMultiplier,
-		NumRetries:          DefaultNumRetries,
+		MaxNumRetries:       DefaultMaxNumRetries,
 	}
 }
 
@@ -62,7 +62,7 @@ func ChainRetryConfig() *RetryConfig {
 		MaxElapsedTime:      DefaultMaxElapsedTime,
 		RandomizationFactor: DefaultRandomizationFactor,
 		Multiplier:          DefaultMultiplier,
-		NumRetries:          DefaultNumRetries,
+		MaxNumRetries:       DefaultMaxNumRetries,
 	}
 }
 
@@ -161,7 +161,7 @@ func RetryWithData[T any](functionToRetry func() (T, error), config *RetryConfig
 	var maxRetriesBackoff backoff.BackOff
 
 	if config.NumRetries > 0 {
-		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.NumRetries)
+		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.MaxNumRetries)
 	} else {
 		maxRetriesBackoff = expBackoff
 	}
@@ -208,7 +208,7 @@ func Retry(functionToRetry func() error, config *RetryConfig) error {
 	var maxRetriesBackoff backoff.BackOff
 
 	if config.NumRetries > 0 {
-		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.NumRetries)
+		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.MaxNumRetries)
 	} else {
 		maxRetriesBackoff = expBackoff
 	}

core/retry_test.go

@@ -49,7 +49,7 @@ func TestRetryWithData(t *testing.T) {
 		MaxElapsedTime:      3,
 		RandomizationFactor: 0,
 		Multiplier:          retry.DefaultMultiplier,
-		NumRetries:          retry.DefaultNumRetries,
+		MaxNumRetries:       retry.DefaultMaxNumRetries,
 	}
 	_, err := retry.RetryWithData(function, config)
 	if err != nil {
@@ -68,7 +68,7 @@ func TestRetry(t *testing.T) {
 		MaxElapsedTime:      3,
 		RandomizationFactor: 0,
 		Multiplier:          retry.DefaultMultiplier,
-		NumRetries:          retry.DefaultNumRetries,
+		MaxNumRetries:       retry.DefaultMaxNumRetries,
 	}
 	err := retry.Retry(function, config)
 	if err != nil {