From f2369f4fae0dbc4b334067780d014778a3820ad1 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Tue, 1 Feb 2022 10:48:53 +0100
Subject: [PATCH] Test pass

---
 plonky2/src/hash/merkle_proofs.rs | 1 -
 starky/src/fibonacci_stark.rs     | 2 +-
 starky/src/get_challenges.rs      | 1 -
 starky/src/prover.rs              | 2 +-
 starky/src/stark.rs               | 3 ++-
 starky/src/verifier.rs            | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plonky2/src/hash/merkle_proofs.rs b/plonky2/src/hash/merkle_proofs.rs
index feb39791..c2f3655d 100644
--- a/plonky2/src/hash/merkle_proofs.rs
+++ b/plonky2/src/hash/merkle_proofs.rs
@@ -31,7 +31,6 @@ pub(crate) fn verify_merkle_proof<F: RichField, H: Hasher<F>>(
     merkle_cap: &MerkleCap<F, H>,
     proof: &MerkleProof<F, H>,
 ) -> Result<()> {
-    dbg!(leaf_index);
     let mut index = leaf_index;
     let mut current_digest = H::hash(&leaf_data, false);
     for &sibling_digest in proof.siblings.iter() {
diff --git a/starky/src/fibonacci_stark.rs b/starky/src/fibonacci_stark.rs
index 06e366dc..488f1d46 100644
--- a/starky/src/fibonacci_stark.rs
+++ b/starky/src/fibonacci_stark.rs
@@ -59,7 +59,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for FibonacciStar
         FE: FieldExtension<D2, BaseField = F>,
         P: PackedField<Scalar = FE>,
     {
-        // // Check public inputs.
+        // Check public inputs.
         // yield_constr.one_first_row(vars.local_values[0] - vars.public_inputs[Self::PI_INDEX_X0]);
         // yield_constr.one_first_row(vars.local_values[1] - vars.public_inputs[Self::PI_INDEX_X1]);
         // yield_constr.one_last_row(vars.local_values[1] - vars.public_inputs[Self::PI_INDEX_RES]);
diff --git a/starky/src/get_challenges.rs b/starky/src/get_challenges.rs
index 1498f764..d6a9b562 100644
--- a/starky/src/get_challenges.rs
+++ b/starky/src/get_challenges.rs
@@ -24,7 +24,6 @@ fn get_challenges<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, cons
     let num_challenges = config.num_challenges;
     let num_fri_queries = config.fri_config.num_query_rounds;
     let lde_size = 1 << (degree_bits + config.fri_config.rate_bits);
-    dbg!(lde_size);
 
     let mut challenger = Challenger::<F, C::Hasher>::new();
 
diff --git a/starky/src/prover.rs b/starky/src/prover.rs
index 6a22e671..e9c31d98 100644
--- a/starky/src/prover.rs
+++ b/starky/src/prover.rs
@@ -124,7 +124,7 @@ where
         timing,
         "compute openings proof",
         PolynomialBatch::prove_openings(
-            &S::fri_instance(zeta, g, rate_bits),
+            &S::fri_instance(zeta, g, rate_bits, config.num_challenges),
             initial_merkle_trees,
             &mut challenger,
             &fri_params,
diff --git a/starky/src/stark.rs b/starky/src/stark.rs
index f91d4fdd..3b8c795a 100644
--- a/starky/src/stark.rs
+++ b/starky/src/stark.rs
@@ -67,10 +67,11 @@ pub trait Stark<F: RichField + Extendable<D>, const D: usize>: Sync {
         zeta: F::Extension,
         g: F::Extension,
         rate_bits: usize,
+        num_challenges: usize,
     ) -> FriInstanceInfo<F, D> {
         let no_blinding_oracle = FriOracleInfo { blinding: false };
         let trace_info = FriPolynomialInfo::from_range(0, 0..Self::COLUMNS);
-        let quotient_info = FriPolynomialInfo::from_range(1, 0..1 << rate_bits);
+        let quotient_info = FriPolynomialInfo::from_range(1, 0..(1 << rate_bits) * num_challenges);
         let zeta_batch = FriBatchInfo {
             point: zeta,
             polynomials: [trace_info.clone(), quotient_info].concat(),
diff --git a/starky/src/verifier.rs b/starky/src/verifier.rs
index ea9945ff..f01c72c5 100644
--- a/starky/src/verifier.rs
+++ b/starky/src/verifier.rs
@@ -31,7 +31,6 @@ where
     [(); S::PUBLIC_INPUTS]:,
 {
     let challenges = proof_with_pis.get_challenges(config, degree_bits)?;
-    dbg!(&challenges.fri_challenges.fri_query_indices);
     verify_with_challenges(stark, proof_with_pis, challenges, config)
 }
 
@@ -115,6 +114,7 @@ where
             challenges.stark_zeta,
             F::primitive_root_of_unity(degree_bits).into(),
             config.fri_config.rate_bits,
+            config.num_challenges,
         ),
         &proof.openings.to_fri_openings(),
         &challenges.fri_challenges,