Skip to content
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

Jump to bottom

Simplify version logic #2474

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Simplify version logic #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
251 changes: 210 additions & 41 deletions version/compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,242 @@
{
"30": [
"v1.10.15",
"v1.10.16",
"v1.10.17"
{
sukantoraymond marked this conversation as resolved.
Show resolved Hide resolved
"major": 1,
"minor": 10,
"patch": 17
},
{
"major": 1,
"minor": 10,
"patch": 16
},
{
"major": 1,
"minor": 10,
"patch": 15
}
],
"29": [
"v1.10.13",
"v1.10.14"
{
"major": 1,
"minor": 10,
"patch": 14
},
{
"major": 1,
"minor": 10,
"patch": 13
}
],
"28": [
"v1.10.9",
"v1.10.10",
"v1.10.11",
"v1.10.12"
{
"major": 1,
"minor": 10,
"patch": 12
},
{
"major": 1,
"minor": 10,
"patch": 11
},
{
"major": 1,
"minor": 10,
"patch": 10
},
{
"major": 1,
"minor": 10,
"patch": 9
}
],
"27": [
"v1.10.5",
"v1.10.6",
"v1.10.7",
"v1.10.8"
{
"major": 1,
"minor": 10,
"patch": 8
},
{
"major": 1,
"minor": 10,
"patch": 7
},
{
"major": 1,
"minor": 10,
"patch": 6
},
{
"major": 1,
"minor": 10,
"patch": 5
}
],
"26": [
"v1.10.1",
"v1.10.2",
"v1.10.3",
"v1.10.4"
{
"major": 1,
"minor": 10,
"patch": 4
},
{
"major": 1,
"minor": 10,
"patch": 3
},
{
"major": 1,
"minor": 10,
"patch": 2
},
{
"major": 1,
"minor": 10,
"patch": 1
}
],
"25": [
"v1.10.0"
{
"major": 1,
"minor": 10,
"patch": 0
}
],
"24": [
"v1.9.10",
"v1.9.11",
"v1.9.12",
"v1.9.14",
"v1.9.15",
"v1.9.16"
{
"major": 1,
"minor": 9,
"patch": 16
},
{
"major": 1,
"minor": 9,
"patch": 15
},
{
"major": 1,
"minor": 9,
"patch": 14
},
{
"major": 1,
"minor": 9,
"patch": 13
},
{
"major": 1,
"minor": 9,
"patch": 12
},
{
"major": 1,
"minor": 9,
"patch": 11
},
{
"major": 1,
"minor": 9,
"patch": 10
}
],
"23": [
"v1.9.9"
{
"major": 1,
"minor": 9,
"patch": 9
}
],
"22": [
"v1.9.6",
"v1.9.7",
"v1.9.8"
{
"major": 1,
"minor": 9,
"patch": 8
},
{
"major": 1,
"minor": 9,
"patch": 7
},
{
"major": 1,
"minor": 9,
"patch": 6
}
],
"21": [
"v1.9.5"
{
"major": 1,
"minor": 9,
"patch": 5
}
],
"20": [
"v1.9.4"
{
"major": 1,
"minor": 9,
"patch": 4
}
],
"19": [
"v1.9.2",
"v1.9.3"
{
"major": 1,
"minor": 9,
"patch": 3
},
{
"major": 1,
"minor": 9,
"patch": 2
}
],
"18": [
"v1.9.1"
{
"major": 1,
"minor": 9,
"patch": 1
}
],
"17": [
"v1.9.0"
{
"major": 1,
"minor": 9,
"patch": 0
}
],
"16": [
"v1.8.0",
"v1.8.1",
"v1.8.2",
"v1.8.3",
"v1.8.4",
"v1.8.5",
"v1.8.6"
{
"major": 1,
"minor": 8,
"patch": 6
},
{
"major": 1,
"minor": 8,
"patch": 5
},
{
"major": 1,
"minor": 8,
"patch": 4
},
{
"major": 1,
"minor": 8,
"patch": 3
},
{
"major": 1,
"minor": 8,
"patch": 2
},
{
"major": 1,
"minor": 8,
"patch": 1
},
{
"major": 1,
"minor": 8,
"patch": 0
}
]
}
16 changes: 1 addition & 15 deletions version/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,11 @@ var (
)

func init() {
var parsedRPCChainVMCompatibility map[uint][]string
err := json.Unmarshal(rpcChainVMProtocolCompatibilityBytes, &parsedRPCChainVMCompatibility)
err := json.Unmarshal(rpcChainVMProtocolCompatibilityBytes, &RPCChainVMProtocolCompatibility)
if err != nil {
panic(err)
}

RPCChainVMProtocolCompatibility = make(map[uint][]*Semantic)
for rpcChainVMProtocol, versionStrings := range parsedRPCChainVMCompatibility {
versions := make([]*Semantic, len(versionStrings))
for i, versionString := range versionStrings {
version, err := Parse(versionString)
if err != nil {
panic(err)
}
versions[i] = version
}
RPCChainVMProtocolCompatibility[rpcChainVMProtocol] = versions
}

// The mainnet stop vertex is well known. It can be verified on any fully
// synced node by looking at the parentID of the genesis block.
//
Expand Down
46 changes: 9 additions & 37 deletions version/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,67 +11,39 @@ import (
)

var (
errMissingVersionPrefix = errors.New("missing required version prefix")
errMissingApplicationPrefix = errors.New("missing required application prefix")
errMissingVersions = errors.New("missing version numbers")
)

func Parse(s string) (*Semantic, error) {
if !strings.HasPrefix(s, "v") {
return nil, fmt.Errorf("%w: %q", errMissingVersionPrefix, s)
}

s = s[1:]
major, minor, patch, err := parseVersions(s)
if err != nil {
return nil, err
}

return &Semantic{
Major: major,
Minor: minor,
Patch: patch,
}, nil
}

func ParseApplication(s string) (*Application, error) {
if !strings.HasPrefix(s, "avalanche/") {
return nil, fmt.Errorf("%w: %q", errMissingApplicationPrefix, s)
}

s = s[10:]
major, minor, patch, err := parseVersions(s)
if err != nil {
return nil, err
}

return &Application{
Major: major,
Minor: minor,
Patch: patch,
}, nil
}

func parseVersions(s string) (int, int, int, error) {
splitVersion := strings.SplitN(s, ".", 3)
if numSeperators := len(splitVersion); numSeperators != 3 {
return 0, 0, 0, fmt.Errorf("%w: expected 3 only got %d", errMissingVersions, numSeperators)
return nil, fmt.Errorf("%w: expected 3 only got %d", errMissingVersions, numSeperators)
}

major, err := strconv.Atoi(splitVersion[0])
if err != nil {
return 0, 0, 0, fmt.Errorf("failed to parse %s as a version: %w", s, err)
return nil, fmt.Errorf("failed to parse %s as a version: %w", s, err)
}

minor, err := strconv.Atoi(splitVersion[1])
if err != nil {
return 0, 0, 0, fmt.Errorf("failed to parse %s as a version: %w", s, err)
return nil, fmt.Errorf("failed to parse %s as a version: %w", s, err)
}

patch, err := strconv.Atoi(splitVersion[2])
if err != nil {
return 0, 0, 0, fmt.Errorf("failed to parse %s as a version: %w", s, err)
return nil, fmt.Errorf("failed to parse %s as a version: %w", s, err)
}

return major, minor, patch, nil
return &Application{
Major: major,
Minor: minor,
Patch: patch,
}, nil
}