From fa5a5c5ebf758beda9e31c42aed24ab1dc7dc12f Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Tue, 3 Aug 2021 08:59:25 -0700 Subject: [PATCH] cargo fmt --- src/gates/gate_testing.rs | 2 +- src/gates/gmimc.rs | 1 - src/gates/noop.rs | 1 - src/gates/random_access.rs | 14 ++++++-------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/gates/gate_testing.rs b/src/gates/gate_testing.rs index e6f1b3e7..f7a17d81 100644 --- a/src/gates/gate_testing.rs +++ b/src/gates/gate_testing.rs @@ -3,7 +3,7 @@ use anyhow::{ensure, Result}; use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::field_types::Field; use crate::gates::gate::Gate; -use crate::hash::hash_types::{HashOut}; +use crate::hash::hash_types::HashOut; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::circuit_data::CircuitConfig; diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs index 9c04b7be..4a9425af 100644 --- a/src/gates/gmimc.rs +++ b/src/gates/gmimc.rs @@ -326,7 +326,6 @@ mod tests { use anyhow::Result; use crate::field::crandall_field::CrandallField; - use crate::field::field_types::Field; use crate::gates::gate::Gate; use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; diff --git a/src/gates/noop.rs b/src/gates/noop.rs index add5f296..d9a3953e 100644 --- a/src/gates/noop.rs +++ b/src/gates/noop.rs @@ -56,7 +56,6 @@ impl, const D: usize> Gate for NoopGate { #[cfg(test)] mod tests { - use crate::field::crandall_field::CrandallField; use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; diff --git a/src/gates/random_access.rs b/src/gates/random_access.rs index 90ac952c..49ef3ecb 100644 --- a/src/gates/random_access.rs +++ b/src/gates/random_access.rs @@ -209,7 +209,7 @@ impl, const D: usize> SimpleGenerator for RandomAccessGenera deps } - fn run_once(&self, witness: &PartialWitness) -> GeneratedValues { + fn run_once(&self, witness: &PartialWitness, out_buffer: &mut GeneratedValues) { let local_wire = |input| Wire { gate: self.gate_index, input, @@ -257,15 +257,12 @@ impl, const D: usize> SimpleGenerator for RandomAccessGenera let mut index_matches_vals = vec![F::ZERO; vec_size - 1]; index_matches_vals.insert(access_index, F::ONE); - let mut result = GeneratedValues::::with_capacity((vec_size + 1) * (D + 2)); for i in 0..vec_size { let equality_dummy_wire = local_wire(self.gate.wire_equality_dummy_for_index(i)); - result.set_wire(equality_dummy_wire, equality_dummy_vals[i]); + out_buffer.set_wire(equality_dummy_wire, equality_dummy_vals[i]); let index_matches_wire = local_wire(self.gate.wire_index_matches_for_index(i)); - result.set_wire(index_matches_wire, index_matches_vals[i]); + out_buffer.set_wire(index_matches_wire, index_matches_vals[i]); } - - result } } @@ -273,11 +270,13 @@ impl, const D: usize> SimpleGenerator for RandomAccessGenera mod tests { use std::marker::PhantomData; + use anyhow::Result; + use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticCrandallField; use crate::field::field_types::Field; use crate::gates::gate::Gate; - use crate::gates::gate_testing::{test_low_degree, test_eval_fns}; + use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; use crate::gates::random_access::RandomAccessGate; use crate::hash::hash_types::HashOut; use crate::plonk::vars::EvaluationVars; @@ -309,7 +308,6 @@ mod tests { test_eval_fns::(RandomAccessGate::new(4)) } - #[test] fn test_gate_constraint() { type F = CrandallField;