validation & deserialization match

HerodotusDev · Jan 10, 2024 · cd9a950 · cd9a950
1 parent 96d2ed3
commit cd9a950
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/deserialization/fri.cairo b/src/deserialization/fri.cairo
@@ -124,8 +124,6 @@ impl IntoFriWitness of Into<FriWitnessWithSerde, FriWitness> {
                         },
                     }
                 );
-
-            i += 1;
         };
 
         FriWitness { layers: layers.span(), }

diff --git a/src/deserialization/stark.cairo b/src/deserialization/stark.cairo
@@ -166,7 +166,6 @@ impl IntoStarkUnsentCommitment of Into<StarkUnsentCommitmentWithSerde, StarkUnse
 struct StarkWitnessWithSerde {
     traces_decommitment: TracesDecommitmentWithSerde,
     traces_witness: TracesWitnessWithSerde,
-    interaction: TableCommitmentWitnessWithSerde,
     composition_decommitment: TableDecommitmentWithSerde,
     composition_witness: TableCommitmentWitnessWithSerde,
     fri_witness: FriWitnessWithSerde,
@@ -176,7 +175,6 @@ impl IntoStarkWitness of Into<StarkWitnessWithSerde, StarkWitness> {
         StarkWitness {
             traces_decommitment: self.traces_decommitment.into(),
             traces_witness: self.traces_witness.into(),
-            interaction: self.interaction.into(),
             composition_decommitment: self.composition_decommitment.into(),
             composition_witness: self.composition_witness.into(),
             fri_witness: self.fri_witness.into(),

diff --git a/src/lib.cairo b/src/lib.cairo
@@ -11,9 +11,11 @@ mod stark;
 mod table_commitment;
 mod vector_commitment;
 
-use cairo_verifier::deserialization::stark::StarkProofWithSerde;
+use cairo_verifier::{deserialization::stark::StarkProofWithSerde, stark::StarkProof,};
 
 fn main(x: Array<felt252>) {
     let mut x_span = x.span();
-    let stark_proof: StarkProofWithSerde = Serde::deserialize(ref x_span).unwrap();
+    let stark_proof: StarkProof = Serde::<StarkProofWithSerde>::deserialize(ref x_span)
+        .unwrap()
+        .into();
 }
diff --git a/src/stark.cairo b/src/stark.cairo
@@ -85,7 +85,6 @@ struct StarkUnsentCommitment {
 struct StarkWitness {
     traces_decommitment: TracesDecommitment,
     traces_witness: TracesWitness,
-    interaction: TableCommitmentWitness,
     composition_decommitment: TableDecommitment,
     composition_witness: TableCommitmentWitness,
     fri_witness: FriWitness,
-Original file line number
+Diff line change
@@ Expand Up @@
                             },
                         }
                     );
-                i += 1;
             };
             FriWitness { layers: layers.span(), }
@@ Expand Down @@