From 8cd09994317321a4c0e381a62ac4164e387a967c Mon Sep 17 00:00:00 2001 From: Kobi Gurkan Date: Sat, 28 Mar 2020 21:25:39 +0300 Subject: [PATCH] moves cmp to be under FpGadget --- r1cs-std/src/{ => fields/fp}/cmp.rs | 129 +++++++++++------------ r1cs-std/src/fields/{fp.rs => fp/mod.rs} | 4 +- r1cs-std/src/lib.rs | 2 - 3 files changed, 64 insertions(+), 71 deletions(-) rename r1cs-std/src/{ => fields/fp}/cmp.rs (77%) rename r1cs-std/src/fields/{fp.rs => fp/mod.rs} (99%) diff --git a/r1cs-std/src/cmp.rs b/r1cs-std/src/fields/fp/cmp.rs similarity index 77% rename from r1cs-std/src/cmp.rs rename to r1cs-std/src/fields/fp/cmp.rs index bc729ec..6eb6385 100644 --- a/r1cs-std/src/cmp.rs +++ b/r1cs-std/src/fields/fp/cmp.rs @@ -7,18 +7,14 @@ use algebra::PrimeField; use core::{cmp::Ordering, marker::PhantomData}; use r1cs_core::{ConstraintSystem, SynthesisError}; -pub struct CmpGadget { - constraint_field_type: PhantomData, -} - -impl CmpGadget { - fn process_cmp_inputs>( +impl FpGadget { + fn process_cmp_inputs>( mut cs: CS, - a: &FpGadget, - b: &FpGadget, + a: &FpGadget, + b: &FpGadget, ordering: Ordering, should_also_check_equality: bool, - ) -> Result<(FpGadget, FpGadget), SynthesisError> { + ) -> Result<(FpGadget, FpGadget), SynthesisError> { let left; let right; match ordering { @@ -35,7 +31,7 @@ impl CmpGadget { }, }; let right_for_check = if should_also_check_equality { - right.add_constant(cs.ns(|| "plus one"), &ConstraintF::one())? + right.add_constant(cs.ns(|| "plus one"), &F::one())? } else { right.clone() }; @@ -43,31 +39,31 @@ impl CmpGadget { Ok((left.clone(), right_for_check)) } - fn check_smaller_than_mod_minus_one_div_two>( + fn check_smaller_than_mod_minus_one_div_two>( mut cs: CS, - a: &FpGadget, + a: &FpGadget, ) -> Result<(), SynthesisError> { let a_bits = a.to_bits(cs.ns(|| "a to bits"))?; - Boolean::enforce_smaller_or_equal_than::<_, _, ConstraintF, _>( + Boolean::enforce_smaller_or_equal_than::<_, _, F, _>( cs.ns(|| "enforce smaller than modulus minus one div two"), &a_bits, - ConstraintF::modulus_minus_one_div_two(), + F::modulus_minus_one_div_two(), )?; Ok(()) } /// this function verifies a and b are <= (p-1)/2 - pub fn enforce_cmp>( + pub fn enforce_cmp>( + &self, mut cs: CS, - a: &FpGadget, - b: &FpGadget, + b: &FpGadget, ordering: Ordering, should_also_check_equality: bool, ) -> Result<(), SynthesisError> { let (left, right) = Self::process_cmp_inputs( cs.ns(|| "process cmp inputs"), - a, + &self, b, ordering, should_also_check_equality, @@ -76,16 +72,16 @@ impl CmpGadget { } /// this function assumes a and b are known to be <= (p-1)/2 - pub fn enforce_cmp_unchecked>( + pub fn enforce_cmp_unchecked>( + &self, mut cs: CS, - a: &FpGadget, - b: &FpGadget, + b: &FpGadget, ordering: Ordering, should_also_check_equality: bool, ) -> Result<(), SynthesisError> { let (left, right) = Self::process_cmp_inputs( cs.ns(|| "process cmp inputs"), - a, + &self, b, ordering, should_also_check_equality, @@ -94,16 +90,16 @@ impl CmpGadget { } /// this function verifies a and b are <= (p-1)/2 - pub fn is_cmp>( + pub fn is_cmp>( + &self, mut cs: CS, - a: &FpGadget, - b: &FpGadget, + b: &FpGadget, ordering: Ordering, should_also_check_equality: bool, ) -> Result { let (left, right) = Self::process_cmp_inputs( cs.ns(|| "process cmp inputs"), - a, + &self, b, ordering, should_also_check_equality, @@ -112,16 +108,16 @@ impl CmpGadget { } /// this function assumes a and b are known to be <= (p-1)/2 - pub fn is_cmp_unchecked>( + pub fn is_cmp_unchecked>( + &self, mut cs: CS, - a: &FpGadget, - b: &FpGadget, + b: &FpGadget, ordering: Ordering, should_also_check_equality: bool, ) -> Result { let (left, right) = Self::process_cmp_inputs( cs.ns(|| "process cmp inputs"), - a, + &self, b, ordering, should_also_check_equality, @@ -130,10 +126,10 @@ impl CmpGadget { } /// this function verifies a and b are <= (p-1)/2 - fn is_smaller_than>( + fn is_smaller_than>( mut cs: CS, - a: &FpGadget, - b: &FpGadget, + a: &FpGadget, + b: &FpGadget, ) -> Result { Self::check_smaller_than_mod_minus_one_div_two(cs.ns(|| "check a in range"), a)?; Self::check_smaller_than_mod_minus_one_div_two(cs.ns(|| "check b in range"), b)?; @@ -141,24 +137,24 @@ impl CmpGadget { } /// this function assumes a and b are known to be <= (p-1)/2 - fn is_smaller_than_unchecked>( + fn is_smaller_than_unchecked>( mut cs: CS, - a: &FpGadget, - b: &FpGadget, + a: &FpGadget, + b: &FpGadget, ) -> Result { - let two = ConstraintF::one() + ConstraintF::one(); + let two = F::one() + F::one(); let d0 = a.sub(cs.ns(|| "a - b"), b)?; let d = d0.mul_by_constant(cs.ns(|| "mul 2"), &two)?; - let d_bits = d.to_bits_strict(cs.ns(|| "d to bits"))?; + let d_bits = d.to_bits(cs.ns(|| "d to bits"))?; let d_bits_len = d_bits.len(); Ok(d_bits[d_bits_len - 1]) } /// this function verifies a and b are <= (p-1)/2 - fn enforce_smaller_than>( + fn enforce_smaller_than>( mut cs: CS, - a: &FpGadget, - b: &FpGadget, + a: &FpGadget, + b: &FpGadget, ) -> Result<(), SynthesisError> { Self::check_smaller_than_mod_minus_one_div_two(cs.ns(|| "check a in range"), a)?; Self::check_smaller_than_mod_minus_one_div_two(cs.ns(|| "check b in range"), b)?; @@ -166,21 +162,29 @@ impl CmpGadget { } /// this function assumes a and b are known to be <= (p-1)/2 - fn enforce_smaller_than_unchecked>( + fn enforce_smaller_than_unchecked>( mut cs: CS, - a: &FpGadget, - b: &FpGadget, + a: &FpGadget, + b: &FpGadget, ) -> Result<(), SynthesisError> { let is_smaller_than = Self::is_smaller_than_unchecked(cs.ns(|| "is smaller than"), a, b)?; cs.enforce( || "enforce smaller than", - |_| is_smaller_than.lc(CS::one(), ConstraintF::one()), - |lc| lc + (ConstraintF::one(), CS::one()), - |lc| lc + (ConstraintF::one(), CS::one()), + |_| is_smaller_than.lc(CS::one(), F::one()), + |lc| lc + (F::one(), CS::one()), + |lc| lc + (F::one(), CS::one()), ); Ok(()) } + +} + +pub struct CmpGadget { + constraint_field_type: PhantomData, +} + +impl CmpGadget { } #[cfg(test)] @@ -189,7 +193,6 @@ mod test { use rand_xorshift::XorShiftRng; use std::cmp::Ordering; - use super::CmpGadget; use crate::{ alloc::AllocGadget, fields::fp::FpGadget, test_constraint_system::TestConstraintSystem, }; @@ -222,17 +225,15 @@ mod test { match a.cmp(&b) { Ordering::Less => { - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test"), - &a_var, &b_var, Ordering::Less, false, ) .unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test 2"), - &a_var, &b_var, Ordering::Less, true, @@ -240,17 +241,15 @@ mod test { .unwrap(); }, Ordering::Greater => { - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test"), - &a_var, &b_var, Ordering::Greater, false, ) .unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test 2"), - &a_var, &b_var, Ordering::Greater, true, @@ -275,17 +274,15 @@ mod test { match b.cmp(&a) { Ordering::Less => { - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test"), - &a_var, &b_var, Ordering::Less, false, ) .unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test 2"), - &a_var, &b_var, Ordering::Less, true, @@ -293,17 +290,15 @@ mod test { .unwrap(); }, Ordering::Greater => { - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test"), - &a_var, &b_var, Ordering::Greater, false, ) .unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test 2"), - &a_var, &b_var, Ordering::Greater, true, @@ -320,10 +315,9 @@ mod test { let mut cs = TestConstraintSystem::::new(); let a = rand_in_range(&mut rng); let a_var = FpGadget::::alloc(cs.ns(|| "a"), || Ok(a)).unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than test"), &a_var, - &a_var, Ordering::Less, false, ) @@ -336,10 +330,9 @@ mod test { let mut cs = TestConstraintSystem::::new(); let a = rand_in_range(&mut rng); let a_var = FpGadget::::alloc(cs.ns(|| "a"), || Ok(a)).unwrap(); - CmpGadget::::enforce_cmp( + a_var.enforce_cmp( cs.ns(|| "smaller than or equal to test"), &a_var, - &a_var, Ordering::Less, true, ) diff --git a/r1cs-std/src/fields/fp.rs b/r1cs-std/src/fields/fp/mod.rs similarity index 99% rename from r1cs-std/src/fields/fp.rs rename to r1cs-std/src/fields/fp/mod.rs index 999bc71..c4ade06 100644 --- a/r1cs-std/src/fields/fp.rs +++ b/r1cs-std/src/fields/fp/mod.rs @@ -9,6 +9,8 @@ use core::borrow::Borrow; use crate::{boolean::AllocatedBit, prelude::*, Assignment, Vec}; +pub mod cmp; + #[derive(Debug)] pub struct FpGadget { pub value: Option, @@ -625,4 +627,4 @@ impl AllocGadget for FpGadget { variable: Var(variable), }) } -} +} \ No newline at end of file diff --git a/r1cs-std/src/lib.rs b/r1cs-std/src/lib.rs index 48c254c..b0180c2 100644 --- a/r1cs-std/src/lib.rs +++ b/r1cs-std/src/lib.rs @@ -60,7 +60,6 @@ pub use instantiated::jubjub; pub mod pairing; pub mod alloc; -pub mod cmp; pub mod eq; pub mod select; @@ -68,7 +67,6 @@ pub mod prelude { pub use crate::{ alloc::*, bits::{boolean::Boolean, uint32::UInt32, uint8::UInt8, ToBitsGadget, ToBytesGadget}, - cmp::CmpGadget, eq::*, fields::FieldGadget, groups::GroupGadget,