Fixing merge issue (#1406)

The merge of the `Cargo.toml` file from #1287 went bananas 🤷 
Another fix (not unexpected, this was my inexperience with GH Actions)
make the perf commands fail when trigger by push.

Author: beta-ziliani

.github/workflows/benchmark_cargo.yml

@@ -14,7 +14,6 @@ on:
       bencherProject:
         description: "Bencher project:"
         type: "string"
-        default: "slang-dashboard-cargo"
 
   # Run on pushes to 'main' branch:
   push:
@@ -43,6 +42,7 @@ jobs:
       - name: "Set bencher project"
         run: |
           echo "SLANG_BENCHER_PROJECT=${{ inputs.bencherProject }}" >> $GITHUB_ENV
+        if: "${{ inputs.bencherProject }}"
 
       - name: "infra setup"
         run: "./scripts/bin/infra setup"

.github/workflows/benchmark_npm.yml

@@ -14,7 +14,6 @@ on:
       bencherProject:
         description: "Bencher project:"
         type: "string"
-        default: "slang-dashboard-npm"
 
   # Run on pushes to 'main' branch:
   push:
@@ -42,7 +41,8 @@ jobs:
 
       - name: "Set bencher project"
         run: |
-          echo "SLANG_BENCHER_PROJECT=${{ inputs.bencherProject }}" >> $GITHUB_ENV
+          echo "SLANG_BENCHER_PROJECT=${{ inputs.bencherProject || 'slang-dashboard-npm' }}" >> $GITHUB_ENV
+        if: "${{ inputs.bencherProject }}"
 
       - name: "infra setup"
         run: "./scripts/bin/infra setup"

Cargo.lock

@@ -35,6 +35,7 @@ members = [
     "crates/solidity/outputs/npm/package",
     "crates/solidity/outputs/spec",
     "crates/solidity/testing/perf",
+    "crates/solidity/testing/perf/npm",
     "crates/solidity/testing/snapshots",
     "crates/solidity/testing/solc",
     "crates/solidity/testing/sourcify",
@@ -64,23 +65,18 @@ metaslang_bindings = { path = "crates/metaslang/bindings", version = "1.2.1" }
 metaslang_graph_builder = { path = "crates/metaslang/graph_builder", version = "1.2.1" }
 metaslang_cst = { path = "crates/metaslang/cst", version = "1.2.1" }
 
-slang_solidity = { path = "crates/solidity/outputs/cargo/crate", version = "1.2.0" }
-slang_solidity_cli = { path = "crates/solidity/outputs/cargo/cli", version = "1.2.0" }
-solidity_cargo_tests = { path = "crates/solidity/outputs/cargo/tests", version = "1.2.0" }
-solidity_cargo_wasm = { path = "crates/solidity/outputs/cargo/wasm", version = "1.2.0" }
-solidity_language = { path = "crates/solidity/inputs/language", version = "1.2.0" }
-solidity_npm_package = { path = "crates/solidity/outputs/npm/package", version = "1.2.0" }
-solidity_spec = { path = "crates/solidity/outputs/spec", version = "1.2.0" }
-solidity_testing_perf = { path = "crates/solidity/testing/perf", version = "1.2.0" }
-solidity_testing_snapshots = { path = "crates/solidity/testing/snapshots", version = "1.2.0" }
-solidity_testing_solc = { path = "crates/solidity/testing/solc", version = "1.2.0" }
-solidity_testing_sourcify = { path = "crates/solidity/testing/sourcify", version = "1.2.0" }
-
-slang_testlang = { path = "crates/testlang/outputs/cargo/crate", version = "1.2.0" }
-testlang_cargo_tests = { path = "crates/testlang/outputs/cargo/tests", version = "1.2.0" }
-testlang_cargo_wasm = { path = "crates/testlang/outputs/cargo/wasm", version = "1.2.0" }
-testlang_language = { path = "crates/testlang/inputs/language", version = "1.2.0" }
-testlang_npm_package = { path = "crates/testlang/outputs/npm/package", version = "1.2.0" }
+slang_solidity = { path = "crates/solidity/outputs/cargo/crate", version = "1.2.1" }
+slang_solidity_cli = { path = "crates/solidity/outputs/cargo/cli", version = "1.2.1" }
+solidity_cargo_tests = { path = "crates/solidity/outputs/cargo/tests", version = "1.2.1" }
+solidity_cargo_wasm = { path = "crates/solidity/outputs/cargo/wasm", version = "1.2.1" }
+solidity_language = { path = "crates/solidity/inputs/language", version = "1.2.1" }
+solidity_npm_package = { path = "crates/solidity/outputs/npm/package", version = "1.2.1" }
+solidity_spec = { path = "crates/solidity/outputs/spec", version = "1.2.1" }
+solidity_testing_perf = { path = "crates/solidity/testing/perf", version = "1.2.1" }
+solidity_testing_perf_npm = { path = "crates/solidity/testing/perf/npm", version = "1.2.1" }
+solidity_testing_snapshots = { path = "crates/solidity/testing/snapshots", version = "1.2.1" }
+solidity_testing_solc = { path = "crates/solidity/testing/solc", version = "1.2.1" }
+solidity_testing_sourcify = { path = "crates/solidity/testing/sourcify", version = "1.2.1" }
 
 #
 # External

Cargo.toml

@@ -10,6 +10,8 @@ use infra_utils::paths::PathExtensions;
 use crate::toolchains::bencher::run_bench;
 use crate::utils::DryRun;
 
+const DEFAULT_BENCHER_PROJECT: &str = "slang-dashboard-cargo";
+
 #[derive(Clone, Debug, Parser)]
 pub struct CargoController {
     #[command(flatten)]
@@ -70,7 +72,12 @@ impl CargoController {
     fn run_iai_bench(&self, package_name: &str, bench_name: &str) {
         let test_runner = format!("cargo bench --package {package_name} --bench {bench_name}");
 
-        run_bench(self.dry_run.get(), "rust_iai_callgrind", &test_runner);
+        run_bench(
+            self.dry_run.get(),
+            DEFAULT_BENCHER_PROJECT,
+            "rust_iai_callgrind",
+            &test_runner,
+        );
 
         let reports_dir = Path::repo_path("target/iai")
             .join(package_name)

crates/infra/cli/src/commands/perf/cargo/mod.rs

@@ -5,6 +5,8 @@ use infra_utils::cargo::CargoWorkspace;
 use crate::toolchains::bencher::run_bench;
 use crate::utils::DryRun;
 
+const DEFAULT_BENCHER_PROJECT: &str = "slang-dashboard-npm";
+
 #[derive(Clone, Debug, Parser)]
 pub struct NpmController {
     #[arg(short, long, default_value_t = String::from(".*"))]
@@ -38,7 +40,12 @@ impl NpmController {
             hot = &self.hot,
         );
 
-        run_bench(self.dry_run.get(), "json", &test_runner);
+        run_bench(
+            self.dry_run.get(),
+            DEFAULT_BENCHER_PROJECT,
+            "json",
+            &test_runner,
+        );
     }
 
     #[allow(clippy::unnecessary_wraps)]

crates/infra/cli/src/commands/perf/npm/mod.rs

@@ -6,14 +6,7 @@ use infra_utils::github::GitHub;
 // Source: https://github.com/bencherdev/bencher/blob/aa31a002842cfb0da9d6c60569396fc5261f5111/tasks/test_api/src/task/test/smoke_test.rs#L20
 const BENCHER_TEST_TOKEN: &str = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhcGlfa2V5IiwiZXhwIjo1OTkzNjQyMTU2LCJpYXQiOjE2OTg2NzQ4NjEsImlzcyI6Imh0dHBzOi8vZGV2ZWwtLWJlbmNoZXIubmV0bGlmeS5hcHAvIiwic3ViIjoibXVyaWVsLmJhZ2dlQG5vd2hlcmUuY29tIiwib3JnIjpudWxsfQ.9z7jmM53TcVzc1inDxTeX9_OR0PQPpZAsKsCE7lWHfo";
 
-// Default bencher project. Can be overriden with the env var SLANG_BENCHER_PROJECT
-const BENCHER_PROJECT: &str = "slang-extended-dashboard";
-
-fn get_bencher_project() -> String {
-    std::env::var("SLANG_BENCHER_PROJECT").unwrap_or(String::from(BENCHER_PROJECT))
-}
-
-pub(crate) fn run_bench(dry_run: bool, adapter: &str, test_runner: &str) {
+pub(crate) fn run_bench(dry_run: bool, project: &str, adapter: &str, test_runner: &str) {
     let token = if dry_run {
         BENCHER_TEST_TOKEN.to_string()
     } else {
@@ -28,7 +21,7 @@ pub(crate) fn run_bench(dry_run: bool, adapter: &str, test_runner: &str) {
         "dev"
     };
 
-    let project = get_bencher_project();
+    let project = std::env::var("SLANG_BENCHER_PROJECT").unwrap_or(project.to_owned());
 
     let mut command = Command::new("bencher")
         .arg("run")