diff --git a/plonky2/src/fri/witness_util.rs b/plonky2/src/fri/witness_util.rs index 70aebd03..741f839d 100644 --- a/plonky2/src/fri/witness_util.rs +++ b/plonky2/src/fri/witness_util.rs @@ -9,8 +9,8 @@ use crate::plonk::config::AlgebraicHasher; /// Set the targets in a `FriProofTarget` to their corresponding values in a `FriProof`. pub fn set_fri_proof_target( witness: &mut W, - fri_proof: &FriProof, fri_proof_target: &FriProofTarget, + fri_proof: &FriProof, ) where F: RichField + Extendable, W: Witness + ?Sized, diff --git a/plonky2/src/iop/witness.rs b/plonky2/src/iop/witness.rs index 4efd35d3..43dc752d 100644 --- a/plonky2/src/iop/witness.rs +++ b/plonky2/src/iop/witness.rs @@ -162,8 +162,8 @@ pub trait Witness { /// `ProofWithPublicInputs`. fn set_proof_with_pis_target, const D: usize>( &mut self, - proof_with_pis: &ProofWithPublicInputs, proof_with_pis_target: &ProofWithPublicInputsTarget, + proof_with_pis: &ProofWithPublicInputs, ) where F: RichField + Extendable, C::Hasher: AlgebraicHasher, @@ -182,14 +182,14 @@ pub trait Witness { self.set_target(pi_t, pi); } - self.set_proof_target(proof, pt); + self.set_proof_target(pt, proof); } /// Set the targets in a `ProofTarget` to their corresponding values in a `Proof`. fn set_proof_target, const D: usize>( &mut self, - proof: &Proof, proof_target: &ProofTarget, + proof: &Proof, ) where F: RichField + Extendable, C::Hasher: AlgebraicHasher, @@ -258,7 +258,7 @@ pub trait Witness { self.set_extension_target(t, x); } - set_fri_proof_target(self, &proof.opening_proof, &proof_target.opening_proof); + set_fri_proof_target(self, &proof_target.opening_proof, &proof.opening_proof); } fn set_wire(&mut self, wire: Wire, value: F) { diff --git a/plonky2/src/plonk/recursive_verifier.rs b/plonky2/src/plonk/recursive_verifier.rs index cb2bc1e0..8795ef41 100644 --- a/plonky2/src/plonk/recursive_verifier.rs +++ b/plonky2/src/plonk/recursive_verifier.rs @@ -382,7 +382,7 @@ mod tests { let mut builder = CircuitBuilder::::new(config.clone()); let mut pw = PartialWitness::new(); let pt = builder.add_virtual_proof_with_pis(&inner_cd); - pw.set_proof_with_pis_target(&inner_proof, &pt); + pw.set_proof_with_pis_target(&pt, &inner_proof); let inner_data = VerifierCircuitTarget { constants_sigmas_cap: builder.add_virtual_cap(inner_cd.config.fri_config.cap_height),