fix: aggregator accepts ErrorPair

Author: uri-99

aggregator/cmd/main.go

@@ -60,8 +60,8 @@ func aggregatorMain(ctx *cli.Context) error {
 
 	// Listen for new task created in the ServiceManager contract in a separate goroutine, both V1 and V2 subscriptions:
 	go func() {
-		listenErr := aggregator.SubscribeToNewTasks()
-		if listenErr != nil {
+		listenErrPair := aggregator.SubscribeToNewTasks()
+		if listenErrPair != nil {
 			aggregatorConfig.BaseConfig.Logger.Fatal("Error subscribing for new tasks", "err", listenErr)
 		}
 	}()

aggregator/pkg/aggregator.go

@@ -46,7 +46,7 @@ type Aggregator struct {
 	avsReader             *chainio.AvsReader
 	avsSubscriber         *chainio.AvsSubscriber
 	avsWriter             *chainio.AvsWriter
-	taskSubscriber        chan error
+	taskSubscriber        chan chainio.ErrorPair
 	blsAggregationService blsagg.BlsAggregationService
 
 	// BLS Signature Service returns an Index

aggregator/pkg/subscriber.go

@@ -1,18 +1,20 @@
 package pkg
 
-func (agg *Aggregator) SubscribeToNewTasks() error {
-	err := agg.subscribeToNewTasks()
-	if err != nil {
-		return err
+import "github.com/yetanotherco/aligned_layer/core/chainio"
+
+func (agg *Aggregator) SubscribeToNewTasks() *chainio.ErrorPair {
+	errorPairPtr := agg.subscribeToNewTasks()
+	if errorPairPtr != nil {
+		return errorPairPtr
 	}
 
 	for {
 		select {
 		case err := <-agg.taskSubscriber:
 			agg.AggregatorConfig.BaseConfig.Logger.Info("Failed to subscribe to new tasks", "err", err)
-			err = agg.subscribeToNewTasks()
-			if err != nil {
-				return err
+			errorPairPtr = agg.subscribeToNewTasks()
+			if errorPairPtr != nil {
+				return errorPairPtr
 			}
 		case newBatch := <-agg.NewBatchChan:
 			agg.AggregatorConfig.BaseConfig.Logger.Info("Adding new task")
@@ -21,14 +23,12 @@ func (agg *Aggregator) SubscribeToNewTasks() error {
 	}
 }
 
-func (agg *Aggregator) subscribeToNewTasks() error {
-	var err error
-	//subV3 := make(chan error)
-	err = agg.avsSubscriber.SubscribeToNewTasksV3(agg.NewBatchChan, agg.taskSubscriber)
+func (agg *Aggregator) subscribeToNewTasks() *chainio.ErrorPair {
+	errorPairPtr := agg.avsSubscriber.SubscribeToNewTasksV3(agg.NewBatchChan, agg.taskSubscriber)
 
-	if err != nil {
-		agg.AggregatorConfig.BaseConfig.Logger.Info("Failed to create task subscriber", "err", err)
+	if errorPairPtr != nil {
+		agg.AggregatorConfig.BaseConfig.Logger.Info("Failed to create task subscriber", "err", errorPairPtr)
 	}
 
-	return err
+	return errorPairPtr
 }