add forge fmt and test steps

risc0 · Feb 23, 2024 · 2641b54 · 2641b54
1 parent 9b8c94c
commit 2641b54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,13 +58,18 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
+      - uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
+        with:
+          version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
       - run: cargo fmt --all --check
       - run: cargo fmt --all --check --manifest-path relay/tests/methods/guest/Cargo.toml
       - run: cargo clippy
         env:
           RISC0_SKIP_BUILD: true
       - run: cargo sort --workspace --check
       - run: cargo sort --workspace --check relay/tests/methods/guest
+      - run: forge fmt --check
+        working-directory: contracts
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
@@ -101,6 +106,9 @@ jobs:
           key: ${{ matrix.os }}-${{ matrix.feature }}
       # TODO(victor) How to install cargo-risczero
       - run: cargo run --bin cargo-risczero --no-default-features -- risczero install --version $RISC0_TOOLCHAIN_VERSION
+      - uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
+        with:
+          version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
       - name: build workspace
         run: |
           cargo test -F $FEATURE --workspace --timings --no-run \
@@ -120,6 +128,8 @@ jobs:
           name: cargo-timings-${{ matrix.os }}-${{ matrix.device }}
           path: target/cargo-timings/
           retention-days: 5
+      - run: forge test -vvv
+        working-directory: contracts
       - run: sccache --show-stats
 
   doc:

diff --git a/contracts/src/RiscZeroCheats.sol b/contracts/src/RiscZeroCheats.sol
@@ -75,5 +75,4 @@ abstract contract RiscZeroCheats is CommonBase {
             return verifier;
         }
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,5 +75,4 @@ abstract contract RiscZeroCheats is CommonBase { @@
                 return verifier;
             }
         }
     }