From dbaa31d818416531298428da1d94454895b89dd9 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Sun, 20 Mar 2022 10:13:01 +0100 Subject: [PATCH] Back to slice --- plonky2/src/gates/gate_testing.rs | 2 +- plonky2/src/plonk/recursive_verifier.rs | 4 ++-- plonky2/src/plonk/vanishing_poly.rs | 2 +- plonky2/src/plonk/vars.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plonky2/src/gates/gate_testing.rs b/plonky2/src/gates/gate_testing.rs index 2b40b37d..20e45e32 100644 --- a/plonky2/src/gates/gate_testing.rs +++ b/plonky2/src/gates/gate_testing.rs @@ -152,7 +152,7 @@ where let evals = gate.eval_unfiltered(vars); let vars_t = EvaluationTargets { - local_constants: constants_t, + local_constants: &constants_t, local_wires: &wires_t, public_inputs_hash: &public_inputs_hash_t, }; diff --git a/plonky2/src/plonk/recursive_verifier.rs b/plonky2/src/plonk/recursive_verifier.rs index ce29c7a9..bfe9aeb6 100644 --- a/plonky2/src/plonk/recursive_verifier.rs +++ b/plonky2/src/plonk/recursive_verifier.rs @@ -53,7 +53,7 @@ impl, const D: usize> CircuitBuilder { { let one = self.one_extension(); - let local_constants = proof.openings.constants.clone(); + let local_constants = &proof.openings.constants; let local_wires = &proof.openings.wires; let vars = EvaluationTargets { local_constants, @@ -404,7 +404,7 @@ mod tests { timing.print(); } - // data.verify(proof.clone())?; + data.verify(proof.clone())?; Ok((proof, data.verifier_only, data.common)) } diff --git a/plonky2/src/plonk/vanishing_poly.rs b/plonky2/src/plonk/vanishing_poly.rs index 5caaef1c..77f7ff43 100644 --- a/plonky2/src/plonk/vanishing_poly.rs +++ b/plonky2/src/plonk/vanishing_poly.rs @@ -322,7 +322,7 @@ pub(crate) fn eval_vanishing_poly_recursively< let constraint_terms = with_context!( builder, "evaluate gate constraints", - evaluate_gate_constraints_recursively(builder, common_data, vars.clone()) + evaluate_gate_constraints_recursively(builder, common_data, vars,) ); // The L_1(x) (Z(x) - 1) vanishing terms. diff --git a/plonky2/src/plonk/vars.rs b/plonky2/src/plonk/vars.rs index 10110d81..f71c5d6d 100644 --- a/plonky2/src/plonk/vars.rs +++ b/plonky2/src/plonk/vars.rs @@ -219,13 +219,13 @@ impl<'a, P: PackedField> ExactSizeIterator for EvaluationVarsBaseBatchIterPacked impl<'a, const D: usize> EvaluationTargets<'a, D> { pub fn remove_prefix(&mut self, selector_index: usize) { - self.local_constants.remove(selector_index); + todo!() } } #[derive(Clone)] pub struct EvaluationTargets<'a, const D: usize> { - pub local_constants: Vec>, + pub local_constants: &'a [ExtensionTarget], pub local_wires: &'a [ExtensionTarget], pub public_inputs_hash: &'a HashOutTarget, }