Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

chore: support latest svm #2523

Merged
merged 6 commits into from
Jul 24, 2023
Merged

Conversation

Evalir
Copy link
Contributor

@Evalir Evalir commented Jul 24, 2023

Motivation

Due to alloy-rs/svm-rs@9b0fa3a#diff-4ac4c674e2696c0c39e91b7ba5af3f65b6ffb1a0fa9b90d3f9930a14254ecb98L126 some changes are needed to point to the correct var here, as SVM_HOME does not exist anymore

Solution

Use SVM_DATA_DIR

PR Checklist

  • Added Tests
  • Added Documentation
  • Breaking changes

Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can also bump svm in cargo.lock file

@Evalir
Copy link
Contributor Author

Evalir commented Jul 24, 2023

we don't commit the lockfile ser

Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

failing install test, not sure what's going on there

Comment on lines +227 to +234
Some(dir) => {
if !dir.exists() {
dirs::data_dir().map(|dir| dir.join("svm"))
} else {
Some(dir)
}
}
None => dirs::data_dir().map(|dir| dir.join("svm")),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this also just SVM_DATA_DIR now?

can we use this instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the problem with using this directly is that we'd lock the crate to use svm always instead of conditionally (it's currently a feature)

@Evalir
Copy link
Contributor Author

Evalir commented Jul 24, 2023

@mattsse done, but current failure seems unrelated?

@mattsse
Copy link
Collaborator

mattsse commented Jul 24, 2023

yeah unrelated geth snafu

@DaniPopes mind merging this wen you find the time?

@DaniPopes DaniPopes merged commit d587981 into gakonst:master Jul 24, 2023
18 of 19 checks passed
@Evalir Evalir deleted the evalir/upgrade-svm branch July 24, 2023 18:29
aathan pushed a commit to aathan/ethers-rs that referenced this pull request Jul 27, 2023
* fix: use SVM_DATA_DIR instead of SVM_HOME

* chore: update test

* chore: use correct folder if exists

* fix: change svm home folder detection

* clippy

* actually check if path exists or not
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants