-
Notifications
You must be signed in to change notification settings - Fork 42
feat: support solc prereleases #176
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,18 +76,43 @@ pub struct Releases { | |
|
|
||
| impl Releases { | ||
| /// Get the checksum of a solc version's binary if it exists. | ||
| /// Checks for exact version match or for prerelease. | ||
| pub fn get_checksum(&self, v: &Version) -> Option<Vec<u8>> { | ||
| for build in self.builds.iter() { | ||
| if build.version.eq(v) { | ||
| return Some(build.sha256.clone()); | ||
| } | ||
| } | ||
| None | ||
| let matches = |build_info: &BuildInfo| { | ||
| let matched_release = build_info.version == *v; | ||
|
|
||
| let matched_prelease = !v.pre.is_empty() | ||
| && build_info.version == Version::new(v.major, v.minor, v.patch) | ||
| && build_info.prerelease.as_deref() == Some(v.pre.as_str()); | ||
|
|
||
| matched_release || matched_prelease | ||
| }; | ||
|
|
||
| self.builds | ||
| .iter() | ||
| .find(|build_info| matches(build_info)) | ||
| .map(|build_info| build_info.sha256.clone()) | ||
| } | ||
|
|
||
| /// Returns the artifact of the version if any | ||
| /// Returns the artifact of the version if any, by looking it up in releases or in builds (if | ||
| /// a prerelease). | ||
| pub fn get_artifact(&self, version: &Version) -> Option<&String> { | ||
| self.releases.get(version) | ||
| // Check version artifact in releases. | ||
| if let Some(artifact) = self.releases.get(version) { | ||
| return Some(artifact); | ||
| } | ||
|
|
||
| // If we didn't find any artifact under releases, look up builds for prerelease. | ||
| if !version.pre.is_empty() | ||
| && let Some(build_info) = self.builds.iter().find(|b| { | ||
| b.version == Version::new(version.major, version.minor, version.patch) | ||
| && b.prerelease == Some(version.pre.to_string()) | ||
| }) | ||
| { | ||
| return build_info.path.as_ref(); | ||
| } | ||
|
|
||
| None | ||
| } | ||
|
|
||
| /// Returns a sorted list of all versions | ||
|
|
@@ -104,6 +129,8 @@ pub struct BuildInfo { | |
| pub version: Version, | ||
| #[serde(with = "hex_string")] | ||
| pub sha256: Vec<u8>, | ||
| pub path: Option<String>, | ||
| pub prerelease: Option<String>, | ||
|
Comment on lines
+132
to
+133
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah I see |
||
| } | ||
|
|
||
| /// Helper serde module to serialize and deserialize bytes as hex. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, that makes sense