From dc145501fdd8af104d81a7584c73f633644a4020 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Wed, 14 Sep 2022 10:10:08 +0200 Subject: [PATCH] Remove `num_virtual_targets` from `CommonCircuitData` --- plonky2/src/iop/generator.rs | 1 - plonky2/src/iop/witness.rs | 9 ++------- plonky2/src/plonk/circuit_builder.rs | 1 - plonky2/src/plonk/circuit_data.rs | 2 -- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/plonky2/src/iop/generator.rs b/plonky2/src/iop/generator.rs index 5bedf13d..3614b2e4 100644 --- a/plonky2/src/iop/generator.rs +++ b/plonky2/src/iop/generator.rs @@ -31,7 +31,6 @@ pub(crate) fn generate_partial_witness< let mut witness = PartitionWitness::new( config.num_wires, common_data.degree(), - common_data.num_virtual_targets, &prover_data.representative_map, ); diff --git a/plonky2/src/iop/witness.rs b/plonky2/src/iop/witness.rs index caa22c33..e7f21241 100644 --- a/plonky2/src/iop/witness.rs +++ b/plonky2/src/iop/witness.rs @@ -278,14 +278,9 @@ pub struct PartitionWitness<'a, F: Field> { } impl<'a, F: Field> PartitionWitness<'a, F> { - pub fn new( - num_wires: usize, - degree: usize, - num_virtual_targets: usize, - representative_map: &'a [usize], - ) -> Self { + pub fn new(num_wires: usize, degree: usize, representative_map: &'a [usize]) -> Self { Self { - values: vec![None; degree * num_wires + num_virtual_targets], + values: vec![None; representative_map.len()], representative_map, num_wires, degree, diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs index ca68af9c..579a9017 100644 --- a/plonky2/src/plonk/circuit_builder.rs +++ b/plonky2/src/plonk/circuit_builder.rs @@ -814,7 +814,6 @@ impl, const D: usize> CircuitBuilder { quotient_degree_factor, num_gate_constraints, num_constants, - num_virtual_targets: self.virtual_target_index, num_public_inputs, k_is, num_partial_products, diff --git a/plonky2/src/plonk/circuit_data.rs b/plonky2/src/plonk/circuit_data.rs index fb839978..20697d36 100644 --- a/plonky2/src/plonk/circuit_data.rs +++ b/plonky2/src/plonk/circuit_data.rs @@ -265,8 +265,6 @@ pub struct CommonCircuitData< /// The number of constant wires. pub(crate) num_constants: usize, - pub(crate) num_virtual_targets: usize, - pub(crate) num_public_inputs: usize, /// The `{k_i}` valued used in `S_ID_i` in Plonk's permutation argument.