Fix merge problems

This commit is contained in:
wborgeaud 2021-07-19 07:11:40 +02:00
parent 461f24a57e
commit b7d51db979
2 changed files with 3 additions and 4 deletions

View File

@ -158,7 +158,6 @@ mod tests {
use super::*;
use crate::circuit_data::CircuitConfig;
use crate::field::crandall_field::CrandallField;
use crate::field::extension_field::quartic::QuarticCrandallField;
use crate::merkle_tree::MerkleTree;
use crate::verifier::verify;
use crate::witness::PartialWitness;

View File

@ -248,10 +248,10 @@ impl<F: Field> ListPolynomialCommitment<F> {
}
}
#[derive(Serialize, Deserialize, Debug)]
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(bound = "")]
pub struct OpeningProof<F: Extendable<D>, const D: usize> {
fri_proof: FriProof<F, D>,
pub(crate) fri_proof: FriProof<F, D>,
// TODO: Get the degree from `CommonCircuitData` instead.
quotient_degree: usize,
}
@ -283,7 +283,7 @@ impl<F: Extendable<D>, const D: usize> OpeningProof<F, D> {
}
pub struct OpeningProofTarget<const D: usize> {
fri_proof: FriProofTarget<D>,
pub(crate) fri_proof: FriProofTarget<D>,
}
impl<const D: usize> OpeningProofTarget<D> {