From b7d51db9798d9d90f5095df826c84321bdd6a8b7 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Mon, 19 Jul 2021 07:11:40 +0200
Subject: [PATCH] Fix merge problems

---
 src/merkle_proofs.rs         | 1 -
 src/polynomial/commitment.rs | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/merkle_proofs.rs b/src/merkle_proofs.rs
index b7625f63..7b7cb67a 100644
--- a/src/merkle_proofs.rs
+++ b/src/merkle_proofs.rs
@@ -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;
diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs
index 4436a454..0b9e5bb0 100644
--- a/src/polynomial/commitment.rs
+++ b/src/polynomial/commitment.rs
@@ -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> {