add starknet_with_keccak to ci

HerodotusDev · Mar 21, 2024 · 8b29aa1 · 8b29aa1
1 parent c2ae1be
commit 8b29aa1
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/proof_verification_tests.yml b/.github/workflows/proof_verification_tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        layout: ["dex", "recursive", "recursive_with_poseidon", "small", "starknet"]
+        layout: ["dex", "recursive", "recursive_with_poseidon", "small", "starknet", "starknet_with_keccak"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/src/air/layouts.cairo b/src/air/layouts.cairo
@@ -2,10 +2,10 @@
 // mod dex;
 // === DEX END ===
 // === RECURSIVE BEGIN ===
-mod recursive;
+// mod recursive;
 // === RECURSIVE END ===
 // === RECURSIVE_WITH_POSEIDON BEGIN ===
-// mod recursive_with_poseidon;
+mod recursive_with_poseidon;
 // === RECURSIVE_WITH_POSEIDON END ===
 // === SMALL BEGIN ===
 // mod small;

diff --git a/src/deserialization/stark.cairo b/src/deserialization/stark.cairo
@@ -7,10 +7,10 @@ use cairo_verifier::{
     // air::layouts::dex::traces::TracesConfig,
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::traces::TracesConfig,
+    // air::layouts::recursive::traces::TracesConfig,
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::traces::TracesConfig,
+    air::layouts::recursive_with_poseidon::traces::TracesConfig,
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::traces::TracesConfig,

diff --git a/src/deserialization/traces.cairo b/src/deserialization/traces.cairo
@@ -5,14 +5,14 @@ use cairo_verifier::{
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::{
-        traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
-    },
-    // === RECURSIVE END ===
-    // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::{
+    // air::layouts::recursive::{
     // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
+    // === RECURSIVE END ===
+    // === RECURSIVE_WITH_POSEIDON BEGIN ===
+    air::layouts::recursive_with_poseidon::{
+    traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{

diff --git a/src/lib.cairo b/src/lib.cairo
@@ -1,6 +1,6 @@
 mod air;
 // === RECURSIVE BEGIN ===
-mod benches;
+// mod benches;
 // === RECURSIVE END ===
 mod channel;
 mod common;
@@ -15,7 +15,7 @@ mod table_commitment;
 mod vector_commitment;
 
 // === RECURSIVE BEGIN ===
-mod tests;
+// mod tests;
 // === RECURSIVE END ===
 
 use cairo_verifier::{
@@ -24,10 +24,10 @@ use cairo_verifier::{
     // air::layouts::dex::public_input::DexPublicInputImpl as PublicInputImpl,
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::public_input::RecursivePublicInputImpl as PublicInputImpl,
+    // air::layouts::recursive::public_input::RecursivePublicInputImpl as PublicInputImpl,
 // === RECURSIVE END ===
 // === RECURSIVE_WITH_POSEIDON BEGIN ===
-// air::layouts::recursive_with_poseidon::public_input::RecursiveWithPoseidonPublicInputImpl as PublicInputImpl,
+air::layouts::recursive_with_poseidon::public_input::RecursiveWithPoseidonPublicInputImpl as PublicInputImpl,
 // === RECURSIVE_WITH_POSEIDON END ===
 // === SMALL BEGIN ===
 // air::layouts::small::public_input::SmallPublicInputImpl as PublicInputImpl,

diff --git a/src/oods.cairo b/src/oods.cairo
@@ -8,18 +8,18 @@ use cairo_verifier::{
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::{
-        AIRComposition, AIROods, RecursiveAIRCompositionImpl, RecursiveAIROodsImpl,
-        global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-        constants::CONSTRAINT_DEGREE,
-    },
+    // air::layouts::recursive::{
+    // AIRComposition, AIROods, RecursiveAIRCompositionImpl, RecursiveAIROodsImpl,
+    // global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
+    // constants::CONSTRAINT_DEGREE,
+    // },
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::{
-    // AIRComposition, AIROods, RecursiveWithPoseidonAIRCompositionImpl,
-    // RecursiveWithPoseidonAIROodsImpl, global_values::InteractionElements,
-    // public_input::PublicInput, traces::TracesDecommitment, constants::CONSTRAINT_DEGREE,
-    // },
+    air::layouts::recursive_with_poseidon::{
+    AIRComposition, AIROods, RecursiveWithPoseidonAIRCompositionImpl,
+    RecursiveWithPoseidonAIROodsImpl, global_values::InteractionElements,
+    public_input::PublicInput, traces::TracesDecommitment, constants::CONSTRAINT_DEGREE,
+    },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{

diff --git a/src/stark.cairo b/src/stark.cairo
@@ -15,19 +15,19 @@ use cairo_verifier::{
         // },
         // === DEX END ===
         // === RECURSIVE BEGIN ===
-        layouts::recursive::{
-            traces::{TracesConfig, TracesConfigTrait}, public_input::RecursivePublicInputImpl,
-            traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-            constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND},
-        },
+        // layouts::recursive::{
+        // traces::{TracesConfig, TracesConfigTrait}, public_input::RecursivePublicInputImpl,
+        // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+        // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND},
+        // },
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // layouts::recursive_with_poseidon::{
-    // traces::{TracesConfig, TracesConfigTrait},
-    // public_input::RecursiveWithPoseidonPublicInputImpl,
-    // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-    // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-    // },
+    layouts::recursive_with_poseidon::{
+    traces::{TracesConfig, TracesConfigTrait},
+    public_input::RecursiveWithPoseidonPublicInputImpl,
+    traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+    constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
+    },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // layouts::small::{

diff --git a/src/stark/stark_commit.cairo b/src/stark/stark_commit.cairo
@@ -6,16 +6,16 @@ use cairo_verifier::{
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::{
-        constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
-        traces::traces_commit,
-    },
-    // === RECURSIVE END ===
-    // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::{
+    // air::layouts::recursive::{
     // constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
     // traces::traces_commit,
     // },
+    // === RECURSIVE END ===
+    // === RECURSIVE_WITH_POSEIDON BEGIN ===
+    air::layouts::recursive_with_poseidon::{
+    constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
+    traces::traces_commit,
+    },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{

diff --git a/src/stark/stark_verify.cairo b/src/stark/stark_verify.cairo
@@ -5,10 +5,10 @@ use cairo_verifier::{
     // === DEX BEGIN ===
     // air::layouts::dex::traces::traces_decommit, // === DEX END ===
     // === RECURSIVE BEGIN ===
-    air::layouts::recursive::traces::traces_decommit,
+    // air::layouts::recursive::traces::traces_decommit,
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::traces::traces_decommit,
+    air::layouts::recursive_with_poseidon::traces::traces_decommit,
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::traces::traces_decommit,