fix(ci): run build and test in the same step to avoid recompilation (#2230)

Co-authored-by: Maximo Palopoli <96491141+maximopalopoli@users.noreply.github.com>

Author: JuArce

.github/workflows/build-and-test-rust.yml

@@ -13,7 +13,7 @@ on:
       - ".github/workflows/build-and-test-rust.yml"
 
 jobs:
-  build:
+  build-and-test:
     runs-on: aligned-runner
 
     steps:
@@ -26,6 +26,9 @@ jobs:
           components: rustfmt, clippy
           override: true
 
+      - name: foundry-toolchain
+        uses: foundry-rs/foundry-toolchain@v1.2.0
+
       # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
       - name: Install sp1 toolchain
         run: |
@@ -82,54 +85,13 @@ jobs:
           # We need to skip the build as clippy does not support the riscv32im-risc0-zkvm-elf target
           RISC0_SKIP_BUILD=1 cargo clippy --all -- -D warnings
 
-  test:
-    runs-on: aligned-runner
-    needs: build
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.88.0
-          components: rustfmt, clippy
-          override: true
-
-      - name: foundry-toolchain
-        uses: foundry-rs/foundry-toolchain@v1.2.0
-      
-      # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
-      - name: Install sp1 toolchain
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          source /home/runner/.bashrc
-           ~/.sp1/bin/sp1up
-
-      - name: Install risc0 toolchain
-        run: |
-          curl -L https://risczero.com/install | bash
-          source ~/.bashrc
-          ~/.risc0/bin/rzup install
-
-      - name: Cache Rust dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            crates/target
-          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-rust-
-
       - name: Run Batcher tests
         run: |
           cd crates
           cargo test --all
 
       - name: Run AggregationMode tests
         run: |
-          cd aggregation_mode/proof_aggregator && cargo test
+          cd aggregation_mode/proof_aggregator && SKIP_AGG_PROGRAMS_BUILD=1 cargo test
           cd ../gateway && cargo test
           cd ../payments_poller && cargo test

Makefile

@@ -288,7 +288,7 @@ verify_aggregated_proof_sp1:
 		--public-inputs ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub
 
 proof_aggregator_install: ## Install the aggregation mode with proving enabled
-	cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator_gpu --locked
+	cargo install --path aggregation_mode/proof_aggregator --features prove,gpu --bin proof_aggregator_gpu --locked
 
 proof_aggregator_write_program_ids: ## Write proof aggregator zkvm programs ids
 	@cd aggregation_mode/proof_aggregator && ./scripts/build_programs.sh

aggregation_mode/proof_aggregator/Cargo.toml

@@ -38,27 +38,24 @@ risc0-build = { version = "3.0.3" }
 # Tell risc0 build to find method in ./aggregation_programs/risc0 package
 methods = ["./aggregation_programs/risc0"]
 
-[profile.release]
-opt-level = 3
-
 [features]
 default = []
 prove = []
 gpu = ["risc0-zkvm/cuda"]
 
 [[bin]]
 name = "proof_aggregator_cpu"
-path = "./src/main.rs"
+path = "./src/bin/proof_aggregator_cpu.rs"
 required-features = ["prove"]
 
 [[bin]]
 name = "proof_aggregator_gpu"
-path = "./src/main.rs"
+path = "./src/bin/proof_aggregator_gpu.rs"
 required-features = ["prove", "gpu"]
 
 [[bin]]
 name = "proof_aggregator_dev"
-path = "./src/main.rs"
+path = "./src/bin/proof_aggregator_dev.rs"
 
 [[bin]]
 name = "write_program_image_id_vk_hash"

aggregation_mode/proof_aggregator/src/bin/proof_aggregator_cpu.rs

@@ -0,0 +1,4 @@
+#[tokio::main]
+async fn main() {
+    proof_aggregator::run().await;
+}

aggregation_mode/proof_aggregator/src/bin/proof_aggregator_dev.rs

@@ -0,0 +1,4 @@
+#[tokio::main]
+async fn main() {
+    proof_aggregator::run().await;
+}

aggregation_mode/proof_aggregator/src/bin/proof_aggregator_gpu.rs

@@ -0,0 +1,4 @@
+#[tokio::main]
+async fn main() {
+    proof_aggregator::run().await;
+}

aggregation_mode/proof_aggregator/src/lib.rs

@@ -1,2 +1,34 @@
 pub mod aggregators;
 pub mod backend;
+
+use backend::{config::Config, ProofAggregator};
+use std::env;
+use tracing_subscriber::{EnvFilter, FmtSubscriber};
+
+fn read_config_filepath_from_args() -> String {
+    let args: Vec<String> = env::args().collect();
+    if args.len() < 2 {
+        panic!(
+            "You must provide a config file. Usage: {} <config-file-path>",
+            args[0]
+        );
+    }
+
+    args[1].clone()
+}
+
+pub async fn run() {
+    // ignore sp1_cuda info logs
+    let filter = EnvFilter::new("info,sp1_cuda=warn");
+    let subscriber = FmtSubscriber::builder().with_env_filter(filter).finish();
+    tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
+
+    // load config
+    let config_file_path = read_config_filepath_from_args();
+    tracing::info!("Loading config from {}...", config_file_path);
+    let config = Config::from_file(&config_file_path).expect("Config is valid");
+    tracing::info!("Config loaded");
+
+    let mut proof_aggregator = ProofAggregator::new(config).await;
+    proof_aggregator.start().await;
+}