mirror of
https://github.com/logos-storage/plonky2.git
synced 2026-01-04 23:03:08 +00:00
Fix merge problems
This commit is contained in:
parent
461f24a57e
commit
b7d51db979
@ -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;
|
||||
|
||||
@ -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> {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user