From 0ba59163461c2b0e04680129f2bb69b8742be761 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Thu, 15 Jul 2021 09:11:54 +0200 Subject: [PATCH] Minor --- src/fri/prover.rs | 4 ---- src/polynomial/commitment.rs | 1 + src/recursive_verifier.rs | 7 ++----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/fri/prover.rs b/src/fri/prover.rs index c0c37391..f937ee55 100644 --- a/src/fri/prover.rs +++ b/src/fri/prover.rs @@ -2,7 +2,6 @@ use crate::field::extension_field::{flatten, unflatten, Extendable}; use crate::field::field::Field; use crate::fri::FriConfig; use crate::hash::hash_n_to_1; -use crate::merkle_proofs::verify_merkle_proof; use crate::merkle_tree::MerkleTree; use crate::plonk_challenger::Challenger; use crate::plonk_common::reduce_with_powers; @@ -140,9 +139,6 @@ fn fri_prover_query_round, const D: usize>( .iter() .map(|t| (t.get(x_index).to_vec(), t.prove(x_index))) .collect::>(); - for ((v, p), t) in initial_proof.iter().zip(initial_merkle_trees.iter()) { - verify_merkle_proof(v.clone(), x_index, t.root, p, false).unwrap(); - } for (i, tree) in trees.iter().enumerate() { let arity_bits = config.reduction_arity_bits[i]; let arity = 1 << arity_bits; diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs index 8e3a5579..6f48fe30 100644 --- a/src/polynomial/commitment.rs +++ b/src/polynomial/commitment.rs @@ -321,6 +321,7 @@ mod tests { use super::*; use crate::circuit_data::CircuitConfig; + use crate::fri::FriConfig; use crate::plonk_common::PlonkPolynomials; fn gen_random_test_case, const D: usize>( diff --git a/src/recursive_verifier.rs b/src/recursive_verifier.rs index 7ee4f856..2f7a6d1e 100644 --- a/src/recursive_verifier.rs +++ b/src/recursive_verifier.rs @@ -119,8 +119,6 @@ impl, const D: usize> CircuitBuilder { inner_common_data, self, ); - dbg!(self.num_gates()); - dbg!(self.generators.len()); } } @@ -329,6 +327,7 @@ mod tests { } #[test] + #[ignore] fn test_recursive_verifier() { env_logger::init(); type F = CrandallField; @@ -351,7 +350,7 @@ mod tests { let mut builder = CircuitBuilder::::new(config.clone()); let two = builder.two(); let two = builder.hash_n_to_hash(vec![two], true).elements[0]; - for i in 0..5000 { + for i in 0..1000 { let two = builder.mul(two, two); } let data = builder.build(); @@ -376,8 +375,6 @@ mod tests { builder.add_recursive_verifier(pt, &config, &inner_data, &cd, &mut marked); - dbg!(builder.num_gates()); - dbg!(builder.marked_targets.len()); let data = builder.build(); let recursive_proof = data.prove(pw);