From 37918cccfd148814605d936155ef58714c81dc91 Mon Sep 17 00:00:00 2001
From: David Palm <dvdplm@gmail.com>
Date: Thu, 30 Nov 2023 15:07:10 +0100
Subject: [PATCH] Revert "chore: from_values takes ref"

This reverts commit 7cc123e0a442d41a3610a57a2ee4f8008ef5811f.
---
 evm/src/keccak/keccak_stark.rs       |  6 +++++-
 evm/src/prover.rs                    | 11 +++++++++--
 plonky2/src/fri/oracle.rs            |  8 ++------
 plonky2/src/plonk/circuit_builder.rs |  2 +-
 plonky2/src/plonk/prover.rs          |  4 ++--
 starky/src/prover.rs                 |  6 ++++--
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/evm/src/keccak/keccak_stark.rs b/evm/src/keccak/keccak_stark.rs
index 019b8083..9870b906 100644
--- a/evm/src/keccak/keccak_stark.rs
+++ b/evm/src/keccak/keccak_stark.rs
@@ -722,11 +722,15 @@ mod tests {
             stark.generate_trace(input, 8, &mut timing)
         );
 
+        // TODO: Cloning this isn't great; consider having `from_values` accept a reference,
+        // or having `compute_permutation_z_polys` read trace values from the `PolynomialBatch`.
+        let cloned_trace_poly_values = timed!(timing, "clone", trace_poly_values.clone());
+
         let trace_commitments = timed!(
             timing,
             "compute trace commitment",
             PolynomialBatch::<F, C, D>::from_values(
-                &trace_poly_values,
+                cloned_trace_poly_values,
                 config.fri_config.rate_bits,
                 false,
                 config.fri_config.cap_height,
diff --git a/evm/src/prover.rs b/evm/src/prover.rs
index 77985a23..fe8ad517 100644
--- a/evm/src/prover.rs
+++ b/evm/src/prover.rs
@@ -102,7 +102,14 @@ where
                     timing,
                     &format!("compute trace commitment for {:?}", table),
                     PolynomialBatch::<F, C, D>::from_values(
-                        trace, rate_bits, false, cap_height, timing, None,
+                        // TODO: Cloning this isn't great; consider having `from_values` accept a reference,
+                        // or having `compute_permutation_z_polys` read trace values from the `PolynomialBatch`.
+                        trace.clone(),
+                        rate_bits,
+                        false,
+                        cap_height,
+                        timing,
+                        None,
                     )
                 )
             })
@@ -373,7 +380,7 @@ where
         timing,
         "compute auxiliary polynomials commitment",
         PolynomialBatch::from_values(
-            &auxiliary_polys,
+            auxiliary_polys,
             rate_bits,
             false,
             config.fri_config.cap_height,
diff --git a/plonky2/src/fri/oracle.rs b/plonky2/src/fri/oracle.rs
index bb065b7c..8642a6c5 100644
--- a/plonky2/src/fri/oracle.rs
+++ b/plonky2/src/fri/oracle.rs
@@ -55,7 +55,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
 {
     /// Creates a list polynomial commitment for the polynomials interpolating the values in `values`.
     pub fn from_values(
-        values: &[PolynomialValues<F>],
+        values: Vec<PolynomialValues<F>>,
         rate_bits: usize,
         blinding: bool,
         cap_height: usize,
@@ -65,11 +65,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
         let coeffs = timed!(
             timing,
             "IFFT",
-            values
-                .into_par_iter()
-                .cloned()
-                .map(|v| v.ifft())
-                .collect::<Vec<_>>()
+            values.into_par_iter().map(|v| v.ifft()).collect::<Vec<_>>()
         );
 
         Self::from_coeffs(
diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs
index 279adac9..67db6864 100644
--- a/plonky2/src/plonk/circuit_builder.rs
+++ b/plonky2/src/plonk/circuit_builder.rs
@@ -1029,7 +1029,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         let constants_sigmas_commitment = if commit_to_sigma {
             let constants_sigmas_vecs = [constant_vecs, sigma_vecs.clone()].concat();
             PolynomialBatch::<F, C, D>::from_values(
-                &constants_sigmas_vecs,
+                constants_sigmas_vecs,
                 rate_bits,
                 PlonkOracle::CONSTANTS_SIGMAS.blinding,
                 cap_height,
diff --git a/plonky2/src/plonk/prover.rs b/plonky2/src/plonk/prover.rs
index 208d6450..41aebdb1 100644
--- a/plonky2/src/plonk/prover.rs
+++ b/plonky2/src/plonk/prover.rs
@@ -171,7 +171,7 @@ where
         timing,
         "compute wires commitment",
         PolynomialBatch::<F, C, D>::from_values(
-            &wires_values,
+            wires_values,
             config.fri_config.rate_bits,
             config.zero_knowledge && PlonkOracle::WIRES.blinding,
             config.fri_config.cap_height,
@@ -238,7 +238,7 @@ where
         timing,
         "commit to partial products, Z's and, if any, lookup polynomials",
         PolynomialBatch::from_values(
-            &zs_partial_products_lookups,
+            zs_partial_products_lookups,
             config.fri_config.rate_bits,
             config.zero_knowledge && PlonkOracle::ZS_PARTIAL_PRODUCTS.blinding,
             config.fri_config.cap_height,
diff --git a/starky/src/prover.rs b/starky/src/prover.rs
index 066319c8..23808e0f 100644
--- a/starky/src/prover.rs
+++ b/starky/src/prover.rs
@@ -55,7 +55,9 @@ where
         timing,
         "compute trace commitment",
         PolynomialBatch::<F, C, D>::from_values(
-            &trace_poly_values,
+            // TODO: Cloning this isn't great; consider having `from_values` accept a reference,
+            // or having `compute_permutation_z_polys` read trace values from the `PolynomialBatch`.
+            trace_poly_values.clone(),
             rate_bits,
             false,
             cap_height,
@@ -86,7 +88,7 @@ where
             timing,
             "compute permutation Z commitments",
             PolynomialBatch::from_values(
-                &permutation_z_polys,
+                permutation_z_polys,
                 rate_bits,
                 false,
                 config.fri_config.cap_height,