Skip to content

Commit db657e7

Browse files
committed
refactor aggregator to remove taskResponses map
1 parent 8a36b73 commit db657e7

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

aggregator/aggregator.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ type Aggregator struct {
7575
blsAggregationService blsagg.BlsAggregationService
7676
tasks map[types.TaskIndex]cstaskmanager.IIncredibleSquaringTaskManagerTask
7777
tasksMu sync.RWMutex
78-
taskResponses map[types.TaskIndex]map[sdktypes.TaskResponseDigest]cstaskmanager.IIncredibleSquaringTaskManagerTaskResponse
79-
taskResponsesMu sync.RWMutex
8078
}
8179

8280
// NewAggregator creates a new Aggregator with the provided config.
@@ -156,7 +154,6 @@ func NewAggregator(c *config.Config) (*Aggregator, error) {
156154
avsWriter: avsWriter,
157155
blsAggregationService: blsAggregationService,
158156
tasks: make(map[types.TaskIndex]cstaskmanager.IIncredibleSquaringTaskManagerTask),
159-
taskResponses: make(map[types.TaskIndex]map[sdktypes.TaskResponseDigest]cstaskmanager.IIncredibleSquaringTaskManagerTaskResponse),
160157
}, nil
161158
}
162159

@@ -225,9 +222,7 @@ func (agg *Aggregator) sendAggregatedResponseToContract(blsAggServiceResp blsagg
225222
agg.tasksMu.RLock()
226223
task := agg.tasks[blsAggServiceResp.TaskIndex]
227224
agg.tasksMu.RUnlock()
228-
agg.taskResponsesMu.RLock()
229-
taskResponse := agg.taskResponses[blsAggServiceResp.TaskIndex][blsAggServiceResp.TaskResponseDigest]
230-
agg.taskResponsesMu.RUnlock()
225+
taskResponse, _ := blsAggServiceResp.TaskResponse.(cstaskmanager.IIncredibleSquaringTaskManagerTaskResponse)
231226
_, err := agg.avsWriter.SendAggregatedResponse(context.Background(), task, taskResponse, nonSignerStakesAndSignature)
232227
if err != nil {
233228
agg.logger.Error("Aggregator failed to respond to task", "err", err)

aggregator/aggregator_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ func createMockAggregator(
155155
avsWriter: mockAvsWriter,
156156
blsAggregationService: mockBlsAggregationService,
157157
tasks: make(map[types.TaskIndex]cstaskmanager.IIncredibleSquaringTaskManagerTask),
158-
taskResponses: make(map[types.TaskIndex]map[sdktypes.TaskResponseDigest]cstaskmanager.IIncredibleSquaringTaskManagerTaskResponse),
159158
}
160159
return aggregator, mockAvsWriter, mockBlsAggregationService, nil
161160
}

aggregator/rpc_server.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import (
77
"net/rpc"
88

99
cstaskmanager "github.com/Layr-Labs/incredible-squaring-avs/contracts/bindings/IncredibleSquaringTaskManager"
10-
"github.com/Layr-Labs/incredible-squaring-avs/core"
1110

1211
"github.com/Layr-Labs/eigensdk-go/crypto/bls"
1312
"github.com/Layr-Labs/eigensdk-go/types"
14-
sdktypes "github.com/Layr-Labs/eigensdk-go/types"
1513
)
1614

1715
var (
@@ -50,21 +48,8 @@ type SignedTaskResponse struct {
5048
func (agg *Aggregator) ProcessSignedTaskResponse(signedTaskResponse *SignedTaskResponse, reply *bool) error {
5149
agg.logger.Infof("Received signed task response: %#v", signedTaskResponse)
5250
taskIndex := signedTaskResponse.TaskResponse.ReferenceTaskIndex
53-
taskResponseDigest, err := core.GetTaskResponseDigest(&signedTaskResponse.TaskResponse)
54-
if err != nil {
55-
agg.logger.Error("Failed to get task response digest", "err", err)
56-
return TaskResponseDigestNotFoundError500
57-
}
58-
agg.taskResponsesMu.Lock()
59-
if _, ok := agg.taskResponses[taskIndex]; !ok {
60-
agg.taskResponses[taskIndex] = make(map[sdktypes.TaskResponseDigest]cstaskmanager.IIncredibleSquaringTaskManagerTaskResponse)
61-
}
62-
if _, ok := agg.taskResponses[taskIndex][taskResponseDigest]; !ok {
63-
agg.taskResponses[taskIndex][taskResponseDigest] = signedTaskResponse.TaskResponse
64-
}
65-
agg.taskResponsesMu.Unlock()
6651

67-
err = agg.blsAggregationService.ProcessNewSignature(
52+
err := agg.blsAggregationService.ProcessNewSignature(
6853
context.Background(), taskIndex, signedTaskResponse.TaskResponse,
6954
&signedTaskResponse.BlsSignature, signedTaskResponse.OperatorId,
7055
)

0 commit comments

Comments
 (0)