use retry config for s3

Author: PatStiles

operator/pkg/operator.go

@@ -66,10 +66,8 @@ type Operator struct {
 }
 
 const (
-	BatchDownloadTimeout    = 1 * time.Minute
-	BatchDownloadMaxRetries = 3
-	BatchDownloadRetryDelay = 5 * time.Second
-	UnverifiedBatchOffset   = 100
+	BatchDownloadTimeout  = 1 * time.Minute
+	UnverifiedBatchOffset = 100
 )
 
 func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
@@ -361,7 +359,7 @@ func (o *Operator) ProcessNewBatchLogV2(newBatchLog *servicemanager.ContractAlig
 	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
 	defer cancel()
 
-	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
+	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
 	if err != nil {
 		o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 		return err
@@ -442,7 +440,7 @@ func (o *Operator) ProcessNewBatchLogV3(newBatchLog *servicemanager.ContractAlig
 	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
 	defer cancel()
 
-	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
+	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
 	if err != nil {
 		o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 		return err

operator/pkg/s3.go

@@ -13,6 +13,8 @@ import (
 	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
 )
 
+const BatchDownloadRetryDelay = 5 * time.Second
+
 func RequestBatch(req *http.Request, ctx context.Context) func() (*http.Response, error) {
 
 	req_func := func() (*http.Response, error) {
@@ -30,20 +32,22 @@ func RequestBatch(req *http.Request, ctx context.Context) func() (*http.Response
 	return req_func
 }
 
-func RequestBatchRetryable(ctx context.Context, logger logging.Logger, req *http.Request) (*http.Response, error) {
+func RequestBatchRetryable(ctx context.Context, logger logging.Logger, req *http.Request, config *retry.RetryConfig) (*http.Response, error) {
 
-	return retry.RetryWithData(RequestBatch(req, ctx), retry.EthCallRetryConfig())
+	return retry.RetryWithData(RequestBatch(req, ctx), config)
 }
 
-func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
+func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
 	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)
 
 	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := RequestBatchRetryable(ctx, o.Logger, req)
+	config := retry.EthCallRetryConfig()
+	config.InitialInterval = BatchDownloadRetryDelay
+	resp, err := RequestBatchRetryable(ctx, o.Logger, req, config)
 	if err != nil {
 		return nil, err
 	}