From e22ab36f7ec79786c8e9f688ad16eda62ef4b687 Mon Sep 17 00:00:00 2001 From: Pratyush Mishra Date: Wed, 9 Sep 2020 13:26:26 -0700 Subject: [PATCH] Fix nits --- r1cs-std/src/fields/cubic_extension.rs | 8 +++- r1cs-std/src/fields/fp/mod.rs | 46 +++++++++++----------- r1cs-std/src/fields/quadratic_extension.rs | 5 ++- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/r1cs-std/src/fields/cubic_extension.rs b/r1cs-std/src/fields/cubic_extension.rs index 12b4633..84ed905 100644 --- a/r1cs-std/src/fields/cubic_extension.rs +++ b/r1cs-std/src/fields/cubic_extension.rs @@ -1,6 +1,6 @@ use algebra::{ fields::{CubicExtField, CubicExtParameters, Field}, - One, + One, Zero, }; use core::{borrow::Borrow, marker::PhantomData}; use r1cs_core::{ConstraintSystemRef, Namespace, SynthesisError}; @@ -250,7 +250,11 @@ where fn inverse(&self) -> Result { let cs = self.cs().get()?.clone(); let one = Self::new_constant(cs.clone(), CubicExtField::one())?; - let inverse = Self::new_witness(cs, || self.value().and_then(|v| v.inverse().get()))?; + + let inverse = Self::new_witness(self.cs().get()?.clone(), || { + self.value() + .map(|f| f.inverse().unwrap_or(CubicExtField::zero())) + })?; self.mul_equals(&inverse, &one)?; Ok(inverse) } diff --git a/r1cs-std/src/fields/fp/mod.rs b/r1cs-std/src/fields/fp/mod.rs index 606258a..da97333 100644 --- a/r1cs-std/src/fields/fp/mod.rs +++ b/r1cs-std/src/fields/fp/mod.rs @@ -79,7 +79,7 @@ impl<'a, F: PrimeField> FieldOpsBounds<'a, F, Self> for FpVar {} impl<'a, F: PrimeField> FieldOpsBounds<'a, F, FpVar> for &'a FpVar {} impl AllocatedFp { - fn from(other: Boolean) -> Self { + pub fn from(other: Boolean) -> Self { if let Some(cs) = other.cs() { let variable = cs.new_lc(other.lc()).unwrap(); Self::new(other.value().ok().map(|b| F::from(b as u8)), variable, cs) @@ -88,11 +88,11 @@ impl AllocatedFp { } } - fn value(&self) -> Result { + pub fn value(&self) -> Result { self.cs.assigned_value(self.variable).get() } - fn add(&self, other: &Self) -> Self { + pub fn add(&self, other: &Self) -> Self { let value = match (self.value, other.value) { (Some(val1), Some(val2)) => Some(val1 + &val2), (..) => None, @@ -105,7 +105,7 @@ impl AllocatedFp { AllocatedFp::new(value, variable, self.cs.clone()) } - fn sub(&self, other: &Self) -> Self { + pub fn sub(&self, other: &Self) -> Self { let value = match (self.value, other.value) { (Some(val1), Some(val2)) => Some(val1 - &val2), (..) => None, @@ -118,7 +118,7 @@ impl AllocatedFp { AllocatedFp::new(value, variable, self.cs.clone()) } - fn mul(&self, other: &Self) -> Self { + pub fn mul(&self, other: &Self) -> Self { let product = AllocatedFp::new_witness(self.cs.clone(), || { Ok(self.value.get()? * &other.value.get()?) }) @@ -133,7 +133,7 @@ impl AllocatedFp { product } - fn add_constant(&self, other: F) -> Self { + pub fn add_constant(&self, other: F) -> Self { if other.is_zero() { self.clone() } else { @@ -146,11 +146,11 @@ impl AllocatedFp { } } - fn sub_constant(&self, other: F) -> Self { + pub fn sub_constant(&self, other: F) -> Self { self.add_constant(-other) } - fn mul_constant(&self, other: F) -> Self { + pub fn mul_constant(&self, other: F) -> Self { if other.is_one() { self.clone() } else { @@ -160,33 +160,35 @@ impl AllocatedFp { } } - fn double(&self) -> Result { + pub fn double(&self) -> Result { let value = self.value.map(|val| val.double()); let variable = self.cs.new_lc(lc!() + self.variable + self.variable)?; Ok(Self::new(value, variable, self.cs.clone())) } #[inline] - fn negate(&self) -> Self { + pub fn negate(&self) -> Self { let mut result = self.clone(); result.negate_in_place(); result } #[inline] - fn negate_in_place(&mut self) -> &mut Self { + pub fn negate_in_place(&mut self) -> &mut Self { self.value.as_mut().map(|val| *val = -(*val)); self.variable = self.cs.new_lc(lc!() - self.variable).unwrap(); self } - fn square(&self) -> Result { + pub fn square(&self) -> Result { Ok(self.mul(self)) } #[inline] - fn inverse(&self) -> Result { - let inverse = Self::new_witness(self.cs.clone(), || self.value.get()?.inverse().get())?; + pub fn inverse(&self) -> Result { + let inverse = Self::new_witness(self.cs.clone(), || { + Ok(self.value.get()?.inverse().unwrap_or(F::zero())) + })?; self.cs.enforce_constraint( lc!() + self.variable, @@ -196,11 +198,11 @@ impl AllocatedFp { Ok(inverse) } - fn frobenius_map(&self, _: usize) -> Result { + pub fn frobenius_map(&self, _: usize) -> Result { Ok(self.clone()) } - fn mul_equals(&self, other: &Self, result: &Self) -> Result<(), SynthesisError> { + pub fn mul_equals(&self, other: &Self, result: &Self) -> Result<(), SynthesisError> { self.cs.enforce_constraint( lc!() + self.variable, lc!() + other.variable, @@ -208,7 +210,7 @@ impl AllocatedFp { ) } - fn square_equals(&self, result: &Self) -> Result<(), SynthesisError> { + pub fn square_equals(&self, result: &Self) -> Result<(), SynthesisError> { self.cs.enforce_constraint( lc!() + self.variable, lc!() + self.variable, @@ -221,7 +223,7 @@ impl AllocatedFp { /// # Constraint cost /// /// Consumes three constraints - fn is_eq(&self, other: &Self) -> Result, SynthesisError> { + pub fn is_eq(&self, other: &Self) -> Result, SynthesisError> { Ok(self.is_neq(other)?.not()) } @@ -230,7 +232,7 @@ impl AllocatedFp { /// # Constraint cost /// /// Consumes three constraints - fn is_neq(&self, other: &Self) -> Result, SynthesisError> { + pub fn is_neq(&self, other: &Self) -> Result, SynthesisError> { let is_not_equal = Boolean::new_witness(self.cs.clone(), || { Ok(self.value.get()? != other.value.get()?) })?; @@ -297,7 +299,7 @@ impl AllocatedFp { } #[inline] - fn conditional_enforce_equal( + pub fn conditional_enforce_equal( &self, other: &Self, should_enforce: &Boolean, @@ -310,7 +312,7 @@ impl AllocatedFp { } #[inline] - fn conditional_enforce_not_equal( + pub fn conditional_enforce_not_equal( &self, other: &Self, should_enforce: &Boolean, @@ -336,7 +338,7 @@ impl AllocatedFp { /****************************************************************************/ impl ToBitsGadget for AllocatedFp { - /// Outputs the unique bit-wise decomposition of `self` in *big-endian* + /// Outputs the unique bit-wise decomposition of `self` in *little-endian* /// form. fn to_bits_le(&self) -> Result>, SynthesisError> { let bits = self.to_non_unique_bits_le()?; diff --git a/r1cs-std/src/fields/quadratic_extension.rs b/r1cs-std/src/fields/quadratic_extension.rs index 8bdb282..d57b312 100644 --- a/r1cs-std/src/fields/quadratic_extension.rs +++ b/r1cs-std/src/fields/quadratic_extension.rs @@ -1,6 +1,6 @@ use algebra::{ fields::{Field, QuadExtField, QuadExtParameters}, - One, + One, Zero, }; use core::{borrow::Borrow, marker::PhantomData}; use r1cs_core::{ConstraintSystemRef, Namespace, SynthesisError}; @@ -256,7 +256,8 @@ where fn inverse(&self) -> Result { let one = Self::new_constant(self.cs().get()?.clone(), QuadExtField::one())?; let inverse = Self::new_witness(self.cs().get()?.clone(), || { - self.value().and_then(|val| val.inverse().get()) + self.value() + .map(|f| f.inverse().unwrap_or(QuadExtField::zero())) })?; self.mul_equals(&inverse, &one)?; Ok(inverse)