logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-03 22:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
wborgeaud 2022-10-17 10:34:08 +02:00
parent aea721e70d
commit 366567935c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plonky2/src/recursion/conditional_recursive_verifier.rs
View File

@ -24,7 +24,6 @@ use crate::plonk::proof::{
use crate::with_context;
/// Generate a proof having a given `CommonCircuitData`.
#[allow(unused)] // TODO: should be used soon.
pub(crate) fn dummy_proof<
F: RichField + Extendable<D>,
C: GenericConfig<D, F = F>,

5
plonky2/src/recursion/cyclic_recursion.rs
View File

@ -146,7 +146,6 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
common_data.num_public_inputs = self.num_public_inputs();
// The `conditionally_verify_proof` gadget below takes 2^12 gates, so `degree_bits` cannot be smaller than 13.
common_data.degree_bits = common_data.degree_bits.max(13);
common_data.fri_params.degree_bits = common_data.fri_params.degree_bits.max(13);
let proof = self.add_virtual_proof_with_pis(&common_data);
@ -180,7 +179,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
);
// Make sure we have enough gates to match `common_data`.
while self.num_gates() < 1 << (common_data.degree_bits - 1) {
while self.num_gates() < (common_data.degree() / 2) {
self.add_gate(NoopGate, vec![]);
}
// Make sure we have every gate to match `common_data`.
@ -261,7 +260,7 @@ where
pw.set_proof_with_pis_target(&cyclic_recursion_data_target.dummy_proof, &dummy_proof);
pw.set_verifier_data_target(
&cyclic_recursion_data_target.dummy_verifier_data,
&dummy_data.verifier_only,
&dummy_data,
);
}