routed_wires -> wires

This commit is contained in:
wborgeaud 2021-08-06 11:30:56 +02:00
parent 99e399f661
commit a6490de7ad
4 changed files with 8 additions and 8 deletions

View File

@ -367,7 +367,7 @@ mod tests {
generate_partial_witness( generate_partial_witness(
&mut witness, &mut witness,
&generators, &generators,
33, 130,
100, 100,
100, 100,
&mut TimingTree::default(), &mut TimingTree::default(),

View File

@ -413,9 +413,9 @@ mod tests {
generate_partial_witness( generate_partial_witness(
&mut witness, &mut witness,
&circuit.prover_only.generators, &circuit.prover_only.generators,
33, 130,
100, 1000,
100, 1000,
&mut TimingTree::default(), &mut TimingTree::default(),
); );
let recursive_output_values_per_round: Vec<Vec<F>> = recursive_outputs_per_round let recursive_output_values_per_round: Vec<Vec<F>> = recursive_outputs_per_round

View File

@ -16,15 +16,15 @@ use crate::util::timing::TimingTree;
pub(crate) fn generate_partial_witness<F: Field>( pub(crate) fn generate_partial_witness<F: Field>(
witness: &mut PartialWitness<F>, witness: &mut PartialWitness<F>,
generators: &[Box<dyn WitnessGenerator<F>>], generators: &[Box<dyn WitnessGenerator<F>>],
num_routed_wires: usize, num_wires: usize,
degree: usize, degree: usize,
max_virtual_target: usize, max_virtual_target: usize,
timing: &mut TimingTree, timing: &mut TimingTree,
) { ) {
let target_index = |t: Target| -> usize { let target_index = |t: Target| -> usize {
match t { match t {
Target::Wire(Wire { gate, input }) => gate * num_routed_wires + input, Target::Wire(Wire { gate, input }) => gate * num_wires + input,
Target::VirtualTarget { index } => degree * num_routed_wires + index, Target::VirtualTarget { index } => degree * num_wires + index,
} }
}; };
let max_target_index = target_index(Target::VirtualTarget { let max_target_index = target_index(Target::VirtualTarget {

View File

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