From 9043a47e1be21e5859d496293411d5d893c2302b Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Wed, 10 Nov 2021 11:15:00 -0800 Subject: [PATCH] more fixes --- src/gadgets/biguint.rs | 22 +++++++++++----------- src/gadgets/multiple_comparison.rs | 6 +++--- src/gadgets/nonnative.rs | 18 +++++++++--------- src/gates/assert_le.rs | 14 ++++++++------ src/gates/subtraction_u32.rs | 10 +++++----- 5 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/gadgets/biguint.rs b/src/gadgets/biguint.rs index ad61c8a0..f9878c50 100644 --- a/src/gadgets/biguint.rs +++ b/src/gadgets/biguint.rs @@ -232,7 +232,7 @@ mod tests { use rand::Rng; use crate::{ - field::crandall_field::CrandallField, + field::goldilocks_field::GoldilocksField, iop::witness::PartialWitness, plonk::{circuit_builder::CircuitBuilder, circuit_data::CircuitConfig, verifier::verify}, }; @@ -245,8 +245,8 @@ mod tests { let y_value = BigUint::from_u128(rng.gen()).unwrap(); let expected_z_value = &x_value + &y_value; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -273,8 +273,8 @@ mod tests { } let expected_z_value = &x_value - &y_value; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -298,8 +298,8 @@ mod tests { let y_value = BigUint::from_u128(rng.gen()).unwrap(); let expected_z_value = &x_value * &y_value; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -322,8 +322,8 @@ mod tests { let x_value = BigUint::from_u128(rng.gen()).unwrap(); let y_value = BigUint::from_u128(rng.gen()).unwrap(); - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -350,8 +350,8 @@ mod tests { } let (expected_div_value, expected_rem_value) = x_value.div_rem(&y_value); - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); diff --git a/src/gadgets/multiple_comparison.rs b/src/gadgets/multiple_comparison.rs index 553fb49e..77e660e6 100644 --- a/src/gadgets/multiple_comparison.rs +++ b/src/gadgets/multiple_comparison.rs @@ -71,16 +71,16 @@ mod tests { use num::BigUint; use rand::Rng; - use crate::field::crandall_field::CrandallField; use crate::field::field_types::Field; + use crate::field::goldilocks_field::GoldilocksField; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; use crate::plonk::circuit_data::CircuitConfig; use crate::plonk::verifier::verify; fn test_list_le(size: usize, num_bits: usize) -> Result<()> { - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); diff --git a/src/gadgets/nonnative.rs b/src/gadgets/nonnative.rs index 1d14f708..fbe46fe2 100644 --- a/src/gadgets/nonnative.rs +++ b/src/gadgets/nonnative.rs @@ -115,8 +115,8 @@ impl, const D: usize> CircuitBuilder { mod tests { use anyhow::Result; - use crate::field::crandall_field::CrandallField; use crate::field::field_types::Field; + use crate::field::goldilocks_field::GoldilocksField; use crate::field::secp256k1::Secp256K1Base; use crate::iop::witness::PartialWitness; use crate::plonk::circuit_builder::CircuitBuilder; @@ -130,8 +130,8 @@ mod tests { let y_ff = FF::rand(); let sum_ff = x_ff + y_ff; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -157,8 +157,8 @@ mod tests { } let diff_ff = x_ff - y_ff; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -181,8 +181,8 @@ mod tests { let y_ff = FF::rand(); let product_ff = x_ff * y_ff; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); @@ -204,8 +204,8 @@ mod tests { let x_ff = FF::rand(); let neg_x_ff = -x_ff; - type F = CrandallField; - let config = CircuitConfig::large_config(); + type F = GoldilocksField; + let config = CircuitConfig::standard_recursion_config(); let pw = PartialWitness::new(); let mut builder = CircuitBuilder::::new(config); diff --git a/src/gates/assert_le.rs b/src/gates/assert_le.rs index 98411ef2..4d33a867 100644 --- a/src/gates/assert_le.rs +++ b/src/gates/assert_le.rs @@ -432,9 +432,9 @@ mod tests { use anyhow::Result; use rand::Rng; - use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::{Field, PrimeField}; + use crate::field::goldilocks_field::GoldilocksField; use crate::gates::assert_le::AssertLessThanGate; use crate::gates::gate::Gate; use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; @@ -443,7 +443,7 @@ mod tests { #[test] fn wire_indices() { - type AG = AssertLessThanGate; + type AG = AssertLessThanGate; let num_bits = 40; let num_chunks = 5; @@ -473,7 +473,7 @@ mod tests { let num_bits = 40; let num_chunks = 5; - test_low_degree::(AssertLessThanGate::<_, 4>::new( + test_low_degree::(AssertLessThanGate::<_, 4>::new( num_bits, num_chunks, )) } @@ -483,13 +483,15 @@ mod tests { let num_bits = 40; let num_chunks = 5; - test_eval_fns::(AssertLessThanGate::<_, 4>::new(num_bits, num_chunks)) + test_eval_fns::(AssertLessThanGate::<_, 4>::new( + num_bits, num_chunks, + )) } #[test] fn test_gate_constraint() { - type F = CrandallField; - type FF = QuarticExtension; + type F = GoldilocksField; + type FF = QuarticExtension; const D: usize = 4; let num_bits = 40; diff --git a/src/gates/subtraction_u32.rs b/src/gates/subtraction_u32.rs index 14447727..225c09e4 100644 --- a/src/gates/subtraction_u32.rs +++ b/src/gates/subtraction_u32.rs @@ -317,9 +317,9 @@ mod tests { use anyhow::Result; use rand::Rng; - use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticExtension; use crate::field::field_types::{Field, PrimeField}; + use crate::field::goldilocks_field::GoldilocksField; use crate::gates::gate::Gate; use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; use crate::gates::subtraction_u32::{U32SubtractionGate, NUM_U32_SUBTRACTION_OPS}; @@ -328,22 +328,22 @@ mod tests { #[test] fn low_degree() { - test_low_degree::(U32SubtractionGate:: { + test_low_degree::(U32SubtractionGate:: { _phantom: PhantomData, }) } #[test] fn eval_fns() -> Result<()> { - test_eval_fns::(U32SubtractionGate:: { + test_eval_fns::(U32SubtractionGate:: { _phantom: PhantomData, }) } #[test] fn test_gate_constraint() { - type F = CrandallField; - type FF = QuarticExtension; + type F = GoldilocksField; + type FF = QuarticExtension; const D: usize = 4; fn get_wires(inputs_x: Vec, inputs_y: Vec, borrows: Vec) -> Vec {