Skip to content

Commit e7db393

Browse files
committed
try fix CI
1 parent 1ff82ab commit e7db393

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/coordinator.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ jobs:
112112
- name: Test coordinator packages
113113
working-directory: 'coordinator'
114114
run: |
115+
make libzkp
115116
# go test -exec "env LD_LIBRARY_PATH=${PWD}/../common/libzkp/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./...
116117
go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic -tags mock_verifier ./...
117118
- name: Upload coverage reports to Codecov

.github/workflows/integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
make dev_docker
3939
make -C rollup mock_abi
4040
make -C common/bytecode all
41+
make -C common/libzkp/impl build
4142
- name: Run integration tests
4243
run: |
4344
go test -v -tags="mock_prover mock_verifier" -p 1 -coverprofile=coverage.txt scroll-tech/integration-test/...

coordinator/internal/logic/provertask/batch_prover_task.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
184184
log.Error("insert batch prover task info fail", "task_id", batchTask.Hash, "publicKey", taskCtx.PublicKey, "err", err)
185185
return nil, ErrCoordinatorInternalFailure
186186
}
187+
// notice uuid is set as a side effect of InsertProverTask
188+
taskMsg.UUID = proverTask.UUID.String()
187189

188190
bp.batchTaskGetTaskTotal.WithLabelValues(hardForkName).Inc()
189191
bp.batchTaskGetTaskProver.With(prometheus.Labels{
@@ -212,7 +214,7 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
212214
for _, chunk := range chunks {
213215
var proof message.OpenVMChunkProof
214216
if encodeErr := json.Unmarshal(chunk.Proof, &proof); encodeErr != nil {
215-
return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, task.TaskID, chunk.Hash)
217+
return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v, (%s)", encodeErr, task.TaskID, chunk.Hash, chunk.Proof)
216218
}
217219
chunkProofs = append(chunkProofs, &proof)
218220

@@ -243,7 +245,6 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
243245
}
244246

245247
taskMsg := &coordinatorType.GetTaskSchema{
246-
UUID: task.UUID.String(),
247248
TaskID: task.TaskID,
248249
TaskType: int(message.ProofTypeBatch),
249250
TaskData: string(chunkProofsBytes),

coordinator/internal/logic/provertask/bundle_prover_task.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat
182182
log.Error("insert bundle prover task info fail", "task_id", bundleTask.Hash, "publicKey", taskCtx.PublicKey, "err", err)
183183
return nil, ErrCoordinatorInternalFailure
184184
}
185+
// notice uuid is set as a side effect of InsertProverTask
186+
taskMsg.UUID = proverTask.UUID.String()
185187

186188
bp.bundleTaskGetTaskTotal.WithLabelValues(hardForkName).Inc()
187189
bp.bundleTaskGetTaskProver.With(prometheus.Labels{
@@ -247,7 +249,6 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov
247249
}
248250

249251
taskMsg := &coordinatorType.GetTaskSchema{
250-
UUID: task.UUID.String(),
251252
TaskID: task.TaskID,
252253
TaskType: int(message.ProofTypeBundle),
253254
TaskData: string(batchProofsBytes),

coordinator/internal/logic/provertask/chunk_prover_task.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
163163
log.Error("format prover task failure", "task_id", chunkTask.Hash, "err", err)
164164
return nil, ErrCoordinatorInternalFailure
165165
}
166+
166167
if getTaskParameter.Universal {
167168
var metadata []byte
168169
taskMsg, metadata, err = cp.applyUniversal(taskMsg)
@@ -179,6 +180,8 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
179180
log.Error("insert chunk prover task fail", "task_id", chunkTask.Hash, "publicKey", taskCtx.PublicKey, "err", err)
180181
return nil, ErrCoordinatorInternalFailure
181182
}
183+
// notice uuid is set as a side effect of InsertProverTask
184+
taskMsg.UUID = proverTask.UUID.String()
182185

183186
cp.chunkTaskGetTaskTotal.WithLabelValues(hardForkName).Inc()
184187
cp.chunkTaskGetTaskProver.With(prometheus.Labels{
@@ -217,7 +220,6 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove
217220
}
218221

219222
proverTaskSchema := &coordinatorType.GetTaskSchema{
220-
UUID: task.UUID.String(),
221223
TaskID: task.TaskID,
222224
TaskType: int(message.ProofTypeChunk),
223225
TaskData: string(taskDetailBytes),

0 commit comments

Comments
 (0)