Skip to content

refactor: remove unused check #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 3, 2025
Merged

refactor: remove unused check #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9adc2bf
remove unused check
georgehao Jul 1, 2025
64b3db7
update
georgehao Jul 1, 2025
9df005e
update
georgehao Jul 1, 2025
21c0c9b
fix unit test
georgehao Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions common/types/message/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ import (
"github.com/scroll-tech/go-ethereum/common/hexutil"
)

const (
EuclidV2Fork = "euclidV2"

EuclidV2ForkNameForProver = "euclidv2"
)

// ProofType represents the type of task.
type ProofType uint8

Expand Down
2 changes: 1 addition & 1 deletion coordinator/cmd/api/app/mock_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (c *CoordinatorApp) MockConfig(store bool) error {
MinProverVersion: "v4.4.89",
Verifiers: []coordinatorConfig.AssetConfig{{
AssetsPath: "",
ForkName: "euclidV2",
ForkName: "feynman",
},
}},
BatchCollectionTimeSec: 60,
Expand Down
14 changes: 10 additions & 4 deletions coordinator/conf/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@
"chunk_collection_time_sec": 180,
"verifier": {
"min_prover_version": "v4.4.45",
"verifiers": [{
"assets_path": "assets",
"fork_name": "euclidV2"
}]
"verifiers": [
{
"assets_path": "assets",
"fork_name": "euclidV2"
},
{
"assets_path": "assets",
"fork_name": "feynman"
}
]
}
},
"db": {
Expand Down
2 changes: 1 addition & 1 deletion coordinator/internal/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestConfig(t *testing.T) {
"min_prover_version": "v4.4.45",
"verifiers": [{
"assets_path": "assets",
"fork_name": "euclidV2"
"fork_name": "feynman"
}]
},
"max_verifier_workers": 4
Expand Down
8 changes: 1 addition & 7 deletions coordinator/internal/logic/provertask/batch_prover_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,7 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*
taskDetail := &message.BatchTaskDetail{
ChunkInfos: chunkInfos,
ChunkProofs: chunkProofs,
}

if hardForkName == message.EuclidV2Fork {
taskDetail.ForkName = message.EuclidV2ForkNameForProver
} else {
log.Error("unsupported hard fork name", "hard_fork_name", hardForkName)
return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName)
ForkName: hardForkName,
}

dbBatchCodecVersion := encoding.CodecVersion(dbBatch.CodecVersion)
Expand Down
8 changes: 1 addition & 7 deletions coordinator/internal/logic/provertask/bundle_prover_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,7 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov

taskDetail := message.BundleTaskDetail{
BatchProofs: batchProofs,
}

if hardForkName == message.EuclidV2Fork {
taskDetail.ForkName = message.EuclidV2ForkNameForProver
} else {
log.Error("unsupported hard fork name", "hard_fork_name", hardForkName)
return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName)
ForkName: hardForkName,
}

taskDetail.BundleInfo = &message.OpenVMBundleInfo{
Expand Down
8 changes: 1 addition & 7 deletions coordinator/internal/logic/provertask/chunk_prover_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,7 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove
taskDetail := message.ChunkTaskDetail{
BlockHashes: blockHashes,
PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash),
}

if hardForkName == message.EuclidV2Fork {
taskDetail.ForkName = message.EuclidV2ForkNameForProver
} else {
log.Error("unsupported hard fork name", "hard_fork_name", hardForkName)
return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName)
ForkName: hardForkName,
}

var err error
Expand Down
Loading