From c4fc9b0ae492f3b9cf0a91ce4836200be3d6302c Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Fri, 26 Aug 2022 09:42:55 +0200
Subject: [PATCH] Merge conflicts

---
 evm/src/cross_table_lookup.rs | 4 ++--
 evm/src/recursive_verifier.rs | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/evm/src/cross_table_lookup.rs b/evm/src/cross_table_lookup.rs
index 40089ecd..5d242ced 100644
--- a/evm/src/cross_table_lookup.rs
+++ b/evm/src/cross_table_lookup.rs
@@ -492,13 +492,13 @@ impl<'a, F: Field, const D: usize> CtlCheckVarsTarget<'a, F, D> {
 
     pub(crate) fn from_proof(
         table: Table,
-        proof: &StarkProofWithPublicInputsTarget<D>,
+        proof: &StarkProofTarget<D>,
         cross_table_lookups: &'a [CrossTableLookup<F>],
         ctl_challenges: &'a GrandProductChallengeSet<Target>,
         num_permutation_zs: usize,
     ) -> Vec<Self> {
         let mut ctl_zs = {
-            let openings = &proof.proof.openings;
+            let openings = &proof.openings;
             let ctl_zs = openings.permutation_ctl_zs.iter().skip(num_permutation_zs);
             let ctl_zs_next = openings
                 .permutation_ctl_zs_next
diff --git a/evm/src/recursive_verifier.rs b/evm/src/recursive_verifier.rs
index f845c364..22347dab 100644
--- a/evm/src/recursive_verifier.rs
+++ b/evm/src/recursive_verifier.rs
@@ -61,7 +61,6 @@ pub(crate) fn recursively_prove_stark_proof<
 ) -> Result<ProofWithPublicInputs<F, C, D>>
 where
     [(); S::COLUMNS]:,
-    [(); S::PUBLIC_INPUTS]:,
     [(); C::Hasher::HASH_SIZE]:,
     C::Hasher: AlgebraicHasher<F>,
 {