Add debug code

Author: MauroToscano

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

@@ -13,119 +13,44 @@ on:
       - ".github/workflows/build-and-test-rust.yml"
 
 jobs:
-  build:
-    runs-on: aligned-runner
-    env:
-      CARGO_INCREMENTAL: 0
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.86.0
-          components: rustfmt, clippy
-          override: true
-
-      - 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
-          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-rust-
-
-      - name: Clean build dir
-        run: rm -rf crates/target
-
-      - name: Check formatting
-        run: |
-          cd crates
-          cargo fmt --all -- --check
-
-      - name: Run Clippy
-        run: |
-          cd crates
-          cargo clippy --all -- -D warnings
-
-      - name: Build Batcher
-        run: |
-          cd crates
-          cargo build --all -vv
-
-      - name: Check formatting of AggregationMode
-        run: |
-          cd aggregation_mode
-          cargo fmt --all -- --check
-
-      - name: Build AggregationMode
-        run: |
-          cd aggregation_mode
-          cargo build --all -vv
-
-      - name: Run Clippy on AggregationMode
-        run: |
-          cd aggregation_mode
-          RISC0_SKIP_BUILD=1 cargo clippy --all -- -D warnings
 
   test:
     runs-on: aligned-runner
     needs: build
-    env:
-      CARGO_INCREMENTAL: 0
-
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: foundry-toolchain
         uses: foundry-rs/[email protected]
 
-      - 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: Clean build dir
-        run: rm -rf crates/target
+      - name: Debug — dump expanded lib with #[cfg(test)]
+        working-directory: crates
+        env:
+          RUSTFLAGS: --cfg test
+        run: |
+          cargo rustc -p aligned-batcher --lib -- -Zunstable-options --pretty=expanded > expanded.rs
+          echo "=== searching for try_build_batch in expanded.rs ==="
+          rg -n 'fn\s+try_build_batch' expanded.rs || true
+          rg -n '__exposed_try_build_batch_for_tests' expanded.rs || true
 
       - name: Run Batcher tests
         run: |
           cd crates
-          cargo test --all -vv
+          cargo test --all
 
       - name: Run AggregationMode tests
         run: |
           cd aggregation_mode
-          cargo test --all -vv
+          cargo test --all

crates/batcher/src/types/batch_queue.rs

@@ -191,6 +191,8 @@ pub(crate) fn try_build_batch(
     Ok(finalized_batch.clone().into_sorted_vec())
 }
 
+pub(crate) use try_build_batch as __exposed_try_build_batch_for_tests;
+
 fn calculate_fee_per_proof(batch_len: usize, gas_price: U256, constant_gas_cost: u128) -> U256 {
     let gas_per_proof = (constant_gas_cost
         + crate::ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF * batch_len as u128)
@@ -207,7 +209,8 @@ mod test {
     use aligned_sdk::common::types::VerificationData;
     use ethers::types::Address;
 
-    use super::try_build_batch;
+    use super::__exposed_try_build_batch_for_tests as try_build_batch;
+
     use super::*;
 
     #[test]