fix(retries): rm retry from InitializeNewTask (#1462)

Co-authored-by: MauroFab <[email protected]>

Author: PatStiles

aggregator/pkg/aggregator.go

@@ -5,14 +5,12 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math/big"
-	"strings"
 	"sync"
 	"time"
 
 	gethtypes "github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/prometheus/client_golang/prometheus"
-	retry "github.com/yetanotherco/aligned_layer/core"
 	"github.com/yetanotherco/aligned_layer/metrics"
 
 	sdkclients "github.com/Layr-Labs/eigensdk-go/chainio/clients"
@@ -396,7 +394,7 @@ func (agg *Aggregator) AddNewTask(batchMerkleRoot [32]byte, senderAddress [20]by
 	quorumNums := eigentypes.QuorumNums{eigentypes.QuorumNum(QUORUM_NUMBER)}
 	quorumThresholdPercentages := eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD)}
 
-	err := agg.InitializeNewTaskRetryable(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout)
+	err := agg.blsAggregationService.InitializeNewTask(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout)
 	if err != nil {
 		agg.logger.Fatalf("BLS aggregation service error when initializing new task: %s", err)
 	}
@@ -409,30 +407,6 @@ func (agg *Aggregator) AddNewTask(batchMerkleRoot [32]byte, senderAddress [20]by
 
 // |---RETRYABLE---|
 
-/*
-InitializeNewTaskRetryable
-Initialize a new task in the BLS Aggregation service
-  - Errors:
-    Permanent:
-  - TaskAlreadyInitializedError (Permanent): Task is already intialized in the BLS Aggregation service (https://github.com/Layr-Labs/eigensdk-go/blob/dev/services/bls_aggregation/blsagg.go#L27).
-    Transient:
-  - All others.
-  - Retry times (3 retries): 1 sec, 2 sec, 4 sec
-*/
-func (agg *Aggregator) InitializeNewTaskRetryable(batchIndex uint32, taskCreatedBlock uint32, quorumNums eigentypes.QuorumNums, quorumThresholdPercentages eigentypes.QuorumThresholdPercentages, timeToExpiry time.Duration) error {
-	initializeNewTask_func := func() error {
-		err := agg.blsAggregationService.InitializeNewTask(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, timeToExpiry)
-		if err != nil {
-			// Task is already initialized
-			if strings.Contains(err.Error(), "already initialized") {
-				err = retry.PermanentError{Inner: err}
-			}
-		}
-		return err
-	}
-	return retry.Retry(initializeNewTask_func, retry.MinDelay, retry.RetryFactor, retry.NumRetries, retry.MaxInterval, retry.MaxElapsedTime)
-}
-
 // Long-lived goroutine that periodically checks and removes old Tasks from stored Maps
 // It runs every GarbageCollectorPeriod and removes all tasks older than GarbageCollectorTasksAge
 // This was added because each task occupies memory in the maps, and we need to free it to avoid a memory leak

core/retry_test.go

@@ -197,51 +197,6 @@ func TestWaitForTransactionReceipt(t *testing.T) {
 // NOTE: The following tests involving starting the aggregator panic after the connection to anvil is cut crashing the test runner.
 // The originates within the eigen-sdk and as of 8/11/24 is currently working to be fixed.
 
-/*
-func TestInitializeNewTask(t *testing.T) {
-
-	_, _, err := SetupAnvil(8545)
-	if err != nil {
-		t.Errorf("Error setting up Anvil: %s\n", err)
-	}
-
-	aggregatorConfig := config.NewAggregatorConfig("../config-files/config-aggregator-test.yaml")
-	agg, err := aggregator.NewAggregator(*aggregatorConfig)
-	if err != nil {
-		aggregatorConfig.BaseConfig.Logger.Error("Cannot create aggregator", "err", err)
-		return
-	}
-	quorumNums := eigentypes.QuorumNums{eigentypes.QuorumNum(byte(0))}
-	quorumThresholdPercentages := eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(byte(57))}
-
-	err = agg.InitializeNewTask(0, 1, quorumNums, quorumThresholdPercentages, 1*time.Second)
-	assert.Nil(t, err)
-
-	if err := cmd.Process.Kill(); err != nil {
-		t.Errorf("error killing process: %v\n", err)
-		return
-	}
-
-	err = agg.InitializeNewTask(0, 1, quorumNums, quorumThresholdPercentages, 1*time.Second)
-	assert.NotNil(t, err)
-	t.Errorf("Error setting Avs Subscriber: %s\n", err)
-
-	_, _, err = SetupAnvil(8545)
-	if err != nil {
-		t.Errorf("Error setting up Anvil: %s\n", err)
-	}
-
-	err = agg.InitializeNewTask(0, 1, quorumNums, quorumThresholdPercentages, 1*time.Second)
-	assert.Nil(t, err)
-	t.Errorf("Error setting Avs Subscriber: %s\n", err)
-
-	if err := cmd.Process.Kill(); err != nil {
-		t.Errorf("error killing process: %v\n", err)
-		return
-	}
-}
-*/
-
 /*
 func TestGetTaskIndex(t *testing.T) {