Skip to content

Commit

Permalink
ylem 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
SashaZezulinsky committed Jan 30, 2024
1 parent a9be57c commit dce8eed
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions cli/tests/it/cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ sparktest_init!(can_install_missing_deps_build, |prj: TestProject, mut cmd: Test
// checks that extra output works
sparktest_init!(can_build_skip_contracts, |prj: TestProject, mut cmd: TestCommand| {
// explicitly set to run with 1.1.0 for consistent output
let config = Config { ylem: Some("1.1.0".into()), ..Default::default() };
let config = Config { ylem: Some("1.1.2".into()), ..Default::default() };
prj.write_config(config);

// only builds the single template contract `src/*`
Expand All @@ -1583,7 +1583,7 @@ sparktest_init!(can_build_skip_contracts, |prj: TestProject, mut cmd: TestComman

sparktest_init!(can_build_skip_glob, |prj: TestProject, mut cmd: TestCommand| {
// explicitly set to run with 1.1.0 for consistent output
let config = Config { ylem: Some("1.1.0".into()), ..Default::default() };
let config = Config { ylem: Some("1.1.2".into()), ..Default::default() };
prj.write_config(config);
prj.inner()
.add_test(
Expand Down
2 changes: 1 addition & 1 deletion cli/tests/it/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ contract Script0 is Script {
// checks that skipping build
sparktest_init!(can_execute_script_and_skip_contracts, |prj: TestProject, mut cmd: TestCommand| {
// explicitly set to run with 1.1.0 for consistent output
let config = Config { ylem: Some("1.1.0".into()), ..Default::default() };
let config = Config { ylem: Some("1.1.2".into()), ..Default::default() };
prj.write_config(config);

let script = prj
Expand Down
4 changes: 2 additions & 2 deletions cli/tests/it/test_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ contract ContractTest is DSTest {
.unwrap();

// pin version
let config = Config { ylem: Some("1.1.0".into()), ..Default::default() };
let config = Config { ylem: Some("1.1.2".into()), ..Default::default() };
prj.write_config(config);

cmd.arg("test");
Expand All @@ -284,7 +284,7 @@ contract ContractTest is DSTest {
);

// pin version
let config = Config { ylem: Some("1.1.0".into()), ..Default::default() };
let config = Config { ylem: Some("1.1.2".into()), ..Default::default() };
prj.write_config(config);

cmd.unchecked_output().stdout_matches_path(
Expand Down
2 changes: 1 addition & 1 deletion pilot/benches/session_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use spark::executor::opts::EvmOpts;
use std::hint::black_box;
use tokio::runtime::Runtime;

static YLEM: Lazy<Ylem> = Lazy::new(|| Ylem::find_or_install_yvm_version("1.1.0").unwrap());
static YLEM: Lazy<Ylem> = Lazy::new(|| Ylem::find_or_install_yvm_version("1.1.2").unwrap());

/// Benchmark for the `clone_with_new_line` function in [SessionSource]
fn clone_with_new_line(c: &mut Criterion) {
Expand Down
6 changes: 3 additions & 3 deletions pilot/src/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1490,10 +1490,10 @@ mod tests {
let mut is_preinstalled = PRE_INSTALL_YLEM_LOCK.lock().unwrap();
if !*is_preinstalled {
let ylem =
Ylem::find_or_install_yvm_version("1.1.0").and_then(|ylem| ylem.version());
Ylem::find_or_install_yvm_version("1.1.2").and_then(|ylem| ylem.version());
if ylem.is_err() {
// try reinstalling
let ylem = Ylem::blocking_install(&"1.1.0".parse().unwrap());
let ylem = Ylem::blocking_install(&"1.1.2".parse().unwrap());
if ylem.map_err(YlemError::from).and_then(|ylem| ylem.version()).is_ok() {
*is_preinstalled = true;
break;
Expand All @@ -1505,7 +1505,7 @@ mod tests {
}
}

let ylem = Ylem::find_or_install_yvm_version("1.1.0").expect("could not install ylem");
let ylem = Ylem::find_or_install_yvm_version("1.1.2").expect("could not install ylem");
SessionSource::new(ylem, Default::default())
}

Expand Down
2 changes: 1 addition & 1 deletion pilot/src/session_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl SessionSourceConfig {
print!("{}", Paint::green("No solidity versions installed! "));
}
// use default
YlemReq::Version("1.1.0".parse().unwrap())
YlemReq::Version("1.1.2".parse().unwrap())
};

match ylem_req {
Expand Down

0 comments on commit dce8eed

Please sign in to comment.