Skip to content

Commit a18142f

Browse files
committed
prune unused field in BatchTask
1 parent 4a5d78a commit a18142f

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

coordinator/internal/logic/provertask/batch_prover_task.go

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -257,32 +257,32 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
257257
}
258258

259259
var chunkProofs []*message.OpenVMChunkProof
260-
var chunkInfos []*message.ChunkInfo
260+
// var chunkInfos []*message.ChunkInfo
261261
for _, chunk := range chunks {
262262
var proof message.OpenVMChunkProof
263263
if encodeErr := json.Unmarshal(chunk.Proof, &proof); encodeErr != nil {
264264
return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, task.TaskID, chunk.Hash)
265265
}
266266
chunkProofs = append(chunkProofs, &proof)
267267

268-
chunkInfo := message.ChunkInfo{
269-
ChainID: bp.cfg.L2.ChainID,
270-
PrevStateRoot: common.HexToHash(chunk.ParentChunkStateRoot),
271-
PostStateRoot: common.HexToHash(chunk.StateRoot),
272-
WithdrawRoot: common.HexToHash(chunk.WithdrawRoot),
273-
DataHash: common.HexToHash(chunk.Hash),
274-
PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash),
275-
PostMsgQueueHash: common.HexToHash(chunk.PostL1MessageQueueHash),
276-
IsPadding: false,
277-
InitialBlockNumber: proof.MetaData.ChunkInfo.InitialBlockNumber,
278-
BlockCtxs: proof.MetaData.ChunkInfo.BlockCtxs,
279-
TxDataLength: proof.MetaData.ChunkInfo.TxDataLength,
280-
EncryptionKey: proof.MetaData.ChunkInfo.EncryptionKey,
281-
}
282-
chunkInfos = append(chunkInfos, &chunkInfo)
268+
// chunkInfo := message.ChunkInfo{
269+
// ChainID: bp.cfg.L2.ChainID,
270+
// PrevStateRoot: common.HexToHash(chunk.ParentChunkStateRoot),
271+
// PostStateRoot: common.HexToHash(chunk.StateRoot),
272+
// WithdrawRoot: common.HexToHash(chunk.WithdrawRoot),
273+
// DataHash: common.HexToHash(chunk.Hash),
274+
// PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash),
275+
// PostMsgQueueHash: common.HexToHash(chunk.PostL1MessageQueueHash),
276+
// IsPadding: false,
277+
// InitialBlockNumber: proof.MetaData.ChunkInfo.InitialBlockNumber,
278+
// BlockCtxs: proof.MetaData.ChunkInfo.BlockCtxs,
279+
// TxDataLength: proof.MetaData.ChunkInfo.TxDataLength,
280+
// EncryptionKey: proof.MetaData.ChunkInfo.EncryptionKey,
281+
// }
282+
// chunkInfos = append(chunkInfos, &chunkInfo)
283283
}
284284

285-
taskDetail, err := bp.getBatchTaskDetail(batch, chunkInfos, chunkProofs, hardForkName)
285+
taskDetail, err := bp.getBatchTaskDetail(batch, chunkProofs, hardForkName)
286286
if err != nil {
287287
return nil, fmt.Errorf("failed to get batch task detail, taskID:%s err:%w", task.TaskID, err)
288288
}
@@ -310,7 +310,7 @@ func (bp *BatchProverTask) recoverActiveAttempts(ctx *gin.Context, batchTask *or
310310
}
311311
}
312312

313-
func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*message.ChunkInfo, chunkProofs []*message.OpenVMChunkProof, hardForkName string) (*message.BatchTaskDetail, error) {
313+
func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkProofs []*message.OpenVMChunkProof, hardForkName string) (*message.BatchTaskDetail, error) {
314314
// Get the version byte.
315315
version, err := bp.version(hardForkName)
316316
if err != nil {
@@ -319,7 +319,6 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*
319319

320320
taskDetail := &message.BatchTaskDetail{
321321
Version: version,
322-
ChunkInfos: chunkInfos,
323322
ChunkProofs: chunkProofs,
324323
ForkName: hardForkName,
325324
}

0 commit comments

Comments
 (0)