Skip to content

perf(test-harness): clone and install each project once per run #571

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

Draft
nebasuke wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

perf(test-harness): clone and install each project once per run #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
280a0e6
perf(test-harness): clone and install each project once per run
nebasuke Jul 12, 2026
6f72527
fix(test-harness): reset reused checkouts with git instead of point g…
nebasuke Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion solx-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ serde.workspace = true
sha2.workspace = true
serde_json.workspace = true
regex.workspace = true
glob.workspace = true
hex.workspace = true
itertools.workspace = true
toml = "1.0"
Expand Down
173 changes: 99 additions & 74 deletions solx-dev/src/test/foundry/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn test(
);
}

for (project_name, project) in config
let projects: Vec<_> = config
.projects
.into_iter()
.filter(|(project_name, project)| {
Expand All @@ -84,46 +84,129 @@ pub fn test(
.iter()
.any(|element| project_name.contains(element)))
})
.collect();

if projects
.iter()
.any(|(_project_name, project)| project.requires_yarn)
{
crate::utils::exists("npm")?;

let build_system = "yarn";
let yarn_version = config.build_systems.get(build_system).ok_or_else(|| {
anyhow::anyhow!("Foundry test configuration missing `build_systems.{build_system}`")
})?;
let npm_spec = format!("{build_system}@{yarn_version}");
let mut npm_install_yarn = Command::new("npm");
npm_install_yarn.arg("install");
npm_install_yarn.args(["--loglevel", "error"]);
npm_install_yarn.arg("--force");
npm_install_yarn.arg("--yes");
npm_install_yarn.arg("--global");
npm_install_yarn.arg(&npm_spec);
crate::utils::command_with_retries(
&mut npm_install_yarn,
format!(
"{} build system {} for Foundry projects",
solx_utils::cargo_status_ok("Installing"),
build_system.bright_yellow().bold()
)
.as_str(),
16,
)?;
}

for (project_name, project) in projects {
attempted_projects.push(project_name.clone());
let mut project_directory = crate::utils::absolute_path(projects_directory.as_path())?;
project_directory.push(project_name.as_str());

crate::utils::remove(project_directory.as_path(), project_name.as_str())?;

let project_directory_str = project_directory.to_string_lossy();
crate::utils::clone_repository(
project.url.as_str(),
&project_directory_str,
project.commit.as_deref(),
&format!(
"{} Foundry project {}",
solx_utils::cargo_status_ok("Cloning"),
project_name.bright_white().bold()
),
)?;

if project.requires_yarn {
let mut yarn_install_command = Command::new("yarn");
yarn_install_command.args(["--cwd", &*project_directory_str]);
yarn_install_command.arg("install");
yarn_install_command.arg("--silent");
crate::utils::command_with_retries(
&mut yarn_install_command,
format!(
"{} dependencies for Foundry project {project_name}",
solx_utils::cargo_status_ok("Installing")
)
.as_str(),
16,
)?;
}

let config_file_name = "foundry.toml";
let mut forge_config_fix_command = Command::new("forge");
forge_config_fix_command.current_dir(project_directory.as_path());
forge_config_fix_command.arg("config");
forge_config_fix_command.arg("--fix");
crate::utils::command(
&mut forge_config_fix_command,
format!(
"{} the configuration file {} of Foundry project {}",
solx_utils::cargo_status_ok("Fixing"),
config_file_name.bright_white().bold(),
project_name.bright_white().bold(),
)
.as_str(),
)?;

crate::utils::commit_checkout(
&project_directory_str,
format!(
"{} the post-setup state of Foundry project {}",
solx_utils::cargo_status_ok("Committing"),
project_name.bright_white().bold()
)
.as_str(),
)?;

for ((identifier, compiler), codegen) in config
.compilers
.iter()
.filter(|(_identifier, compiler)| !compiler.disabled)
.cartesian_product(crate::test::CODEGENS)
{
crate::utils::remove(project_directory.as_path(), project_name.as_str())?;

let solidity_version = compiler
.solidity_version
.as_deref()
.unwrap_or(solidity_version.as_str());

let project_directory_str = project_directory.to_string_lossy();
crate::utils::clone_repository(
project.url.as_str(),
crate::utils::reset_checkout(
&project_directory_str,
project.commit.as_deref(),
&format!(
"{} Foundry project {}",
solx_utils::cargo_status_ok("Cloning"),
format!(
"{} Foundry project {} to its post-setup state",
solx_utils::cargo_status_ok("Resetting"),
project_name.bright_white().bold()
),
)
.as_str(),
)?;

eprintln!(
"{} pragmas in Foundry project {}",
solx_utils::cargo_status_ok("Fixing"),
project_name.bright_white().bold()
);
for solidity_file in
glob::glob(format!("{}/**/*.sol", project_directory.to_string_lossy()).as_str())
.expect("Always valid")
.filter_map(Result::ok)
{
// Tracked files only: dependencies under node_modules keep their
// own pragmas.
for solidity_file in crate::utils::git_tracked_files(&project_directory_str, "*.sol")? {
let solidity_file = project_directory.join(solidity_file);
if !solidity_file.is_file() {
continue;
}
Expand All @@ -136,64 +219,6 @@ pub fn test(
)?;
}

if project.requires_yarn {
crate::utils::exists("npm")?;

let build_system = "yarn";
let yarn_version = config.build_systems.get(build_system).ok_or_else(|| {
anyhow::anyhow!(
"Foundry test configuration missing `build_systems.{build_system}`"
)
})?;
let npm_spec = format!("{build_system}@{yarn_version}");
let mut npm_install_yarn = Command::new("npm");
npm_install_yarn.current_dir(project_directory.as_path());
npm_install_yarn.arg("install");
npm_install_yarn.args(["--loglevel", "error"]);
npm_install_yarn.arg("--force");
npm_install_yarn.arg("--yes");
npm_install_yarn.arg("--global");
npm_install_yarn.arg(&npm_spec);
crate::utils::command_with_retries(
&mut npm_install_yarn,
format!(
"{} build system {} for Foundry project {project_name}",
solx_utils::cargo_status_ok("Installing"),
build_system.bright_yellow().bold()
)
.as_str(),
16,
)?;
let mut yarn_install_command = Command::new(build_system);
yarn_install_command.args(["--cwd", &*project_directory_str]);
yarn_install_command.arg("install");
yarn_install_command.arg("--silent");
crate::utils::command_with_retries(
&mut yarn_install_command,
format!(
"{} dependencies for Foundry project {project_name}",
solx_utils::cargo_status_ok("Installing")
)
.as_str(),
16,
)?;
}

let config_file_name = "foundry.toml";
let mut forge_config_fix_command = Command::new("forge");
forge_config_fix_command.current_dir(project_directory.as_path());
forge_config_fix_command.arg("config");
forge_config_fix_command.arg("--fix");
crate::utils::command(
&mut forge_config_fix_command,
format!(
"{} the configuration file {} of Foundry project {}",
solx_utils::cargo_status_ok("Fixing"),
config_file_name.bright_white().bold(),
project_name.bright_white().bold(),
)
.as_str(),
)?;
crate::utils::sed_file(
project_directory.join(config_file_name).as_path(),
&[
Expand Down
Loading
Loading