Merge branch 'main' into newhint25n24-divmod

lambdaclass · Apr 17, 2023 · 6a3cd1b · 6a3cd1b
2 parents 7916998 + 75e9ab8
commit 6a3cd1b
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 15 deletions.
diff --git a/.github/workflows/hyperfine.yml b/.github/workflows/hyperfine.yml
@@ -31,9 +31,9 @@ jobs:
         uses: actions/cache@v3
         id: cache
         with:
-          path: base_programs/*.json
-          key: benchmarks-${{ hashFiles( 'cairo_programs/benchmarks/*.cairo' ) }}
-          restore-keys: benchmarks-
+          path: ${{ matrix.branch }}_programs/*.json
+          key: benchmarks-${{ matrix.branch }}-${{ hashFiles( 'cairo_programs/benchmarks/*.cairo' ) }}
+          restore-keys: benchmarks-${{ matrix.branch }}-
 
       - name: Install Python
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
@@ -125,13 +125,13 @@ jobs:
       uses: actions/cache/restore@v3
       with:
         path: base_programs/*.json
-        key: benchmarks-${{ needs.build-programs.outputs.benchmark-hashes-base }}
+        key: benchmarks-base-${{ needs.build-programs.outputs.benchmark-hashes-base }}
 
     - name: Fetch head programs
       uses: actions/cache/restore@v3
       with:
         path: head_programs/*.json
-        key: benchmarks-${{ needs.build-programs.outputs.benchmark-hashes-head }}
+        key: benchmarks-head-${{ needs.build-programs.outputs.benchmark-hashes-head }}
 
     - name: Benchmark ${{ matrix.program_state }} programs
       id: run-benchmarks

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cairo-vm-cli/Cargo.toml b/cairo-vm-cli/Cargo.toml
@@ -11,6 +11,10 @@ mimalloc = { version = "0.1.29", default-features = false, optional = true }
 nom = "7"
 thiserror = { version = "1.0.32" }
 
+[dev-dependencies]
+assert_matches = "1.5.0"
+rstest = "0.17.0"
+
 [features]
 default = ["with_mimalloc"]
 with_mimalloc = ["cairo-vm/with_mimalloc", "mimalloc"]