Skip to content

Commit 8b08a57

Browse files
author
colinlyguo
committed
Revert "simplify version checks"
This reverts commit a868bc1.
1 parent a868bc1 commit 8b08a57

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

common/version/prover_version.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,21 @@ func CheckScrollRepoVersion(proverVersion, minVersion string) bool {
3939
return CheckProverSDKWithMinVersion(proverVersion, minVersion)
4040
}
4141

42-
proverVersionPrefix := extractVersionPrefix(proverVersion)
43-
minVersionPrefix := extractVersionPrefix(minVersion)
44-
45-
c, err := semver.NewConstraint(">= " + minVersionPrefix + "-0")
42+
c, err := semver.NewConstraint(">= " + minVersion + "-0")
4643
if err != nil {
47-
log.Error("failed to initialize constraint", "minVersionPrefix", minVersionPrefix, "error", err)
44+
log.Error("failed to initialize constraint", "minVersion", minVersion, "error", err)
4845
return false
4946
}
5047

51-
v, err := semver.NewVersion(proverVersionPrefix + "-z")
48+
v, err := semver.NewVersion(proverVersion + "-z")
5249
if err != nil {
53-
log.Error("failed to parse version", "proverVersion", proverVersionPrefix, "error", err)
50+
log.Error("failed to parse version", "proverVersion", proverVersion, "error", err)
5451
return false
5552
}
5653

5754
return c.Check(v)
5855
}
5956

60-
func extractVersionPrefix(version string) string {
61-
for i, r := range version {
62-
if (r < '0' || r > '9') && r != '.' && r != 'v' {
63-
return version[:i]
64-
}
65-
}
66-
return version
67-
}
68-
6957
// CheckProverSDKWithMinVersion check prover sdk version is at least the minimum required version, it simply returns true for now,
7058
// and more checks will be added as we evolve.
7159
func CheckProverSDKWithMinVersion(proverVersion string, minVersion string) bool {

common/version/prover_version_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ func TestCheckScrollRepoVersion(t *testing.T) {
4949
{"v4.1.98-aaa-bbb-ccc", "v999.0.0", false},
5050
{"v1.0.0", "v1.0.0", true},
5151
{"v1.0.0-alpha", "v1.0.0-alpha", true},
52-
{"v4.4.90-000000--", "v4.4.90-eb7c51fc-58cdda4-9929c6d", true},
5352
}
5453

5554
for _, tt := range tests {

0 commit comments

Comments
 (0)