Merge branch 'main' into partial_witness_vec

# Conflicts:
#	src/iop/challenger.rs

src/gates/gmimc.rs

@@ -367,9 +367,9 @@ mod tests {
         generate_partial_witness(
             &mut witness,
             &generators,
-            130,
-            100,
-            100,
+            gate.num_wires(),
+            1,
+            1,
             &mut TimingTree::default(),
         );
 

src/iop/challenger.rs

@@ -400,7 +400,7 @@ mod tests {
             ..CircuitConfig::default()
         };
         let mut witness = PartialWitness::new(1 << 14, config.num_wires, 1000);
-        let mut builder = CircuitBuilder::<F, 4>::new(config);
+        let mut builder = CircuitBuilder::<F, 4>::new(config.clone());
         let mut recursive_challenger = RecursiveChallenger::new(&mut builder);
         let mut recursive_outputs_per_round: Vec<Vec<Target>> = Vec::new();
         for (r, inputs) in inputs_per_round.iter().enumerate() {
@@ -413,9 +413,9 @@ mod tests {
         generate_partial_witness(
             &mut witness,
             &circuit.prover_only.generators,
-            130,
-            1000,
-            1000,
+            config.num_wires,
+            circuit.common.degree(),
+            circuit.prover_only.num_virtual_targets,
             &mut TimingTree::default(),
         );
         let recursive_output_values_per_round: Vec<Vec<F>> = recursive_outputs_per_round

src/plonk/circuit_builder.rs

@@ -576,7 +576,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             gate_instances: self.gate_instances,
             public_inputs: self.public_inputs,
             marked_targets: self.marked_targets,
-            max_virtual_target_index: self.virtual_target_index,
+            num_virtual_targets: self.virtual_target_index,
         };
 
         // The HashSet of gates will have a non-deterministic order. When converting to a Vec, we

src/plonk/circuit_data.rs

@@ -136,7 +136,8 @@ pub(crate) struct ProverOnlyCircuitData<F: Extendable<D>, const D: usize> {
     pub public_inputs: Vec<Target>,
     /// A vector of marked targets. The values assigned to these targets will be displayed by the prover.
     pub marked_targets: Vec<MarkedTargets<D>>,
-    pub max_virtual_target_index: usize,
+    /// Number of virtual targets used in the circuit.
+    pub num_virtual_targets: usize,
 }
 
 /// Circuit data required by the verifier, but not the prover.

src/plonk/prover.rs

@@ -42,7 +42,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
             &prover_data.generators,
             config.num_wires,
             degree,
-            prover_data.max_virtual_target_index,
+            prover_data.num_virtual_targets,
             &mut timing
         )
     );