arnaucube/ark-r1cs-std
1
0
Fork 0
mirror of https://github.com/arnaucube/ark-r1cs-std.git synced 2026-01-11 00:11:29 +01:00
Code Issues Projects Releases Wiki Activity

removes unused struct + fmt

Browse Source
This commit is contained in:
Kobi Gurkan
2020-03-28 21:43:57 +03:00
committed by Pratyush Mishra
parent 8cd0999431
commit ded3d687cc
2 changed files with 68 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
r1cs-std/src/fields/fp/cmp.rs
View File

@@ -4,7 +4,7 @@ use crate::{
ToBitsGadget, ToBitsGadget,
}; };
use algebra::PrimeField; use algebra::PrimeField;
use core::{cmp::Ordering, marker::PhantomData}; use core::cmp::Ordering;
use r1cs_core::{ConstraintSystem, SynthesisError}; use r1cs_core::{ConstraintSystem, SynthesisError};
impl<F: PrimeField> FpGadget<F> { impl<F: PrimeField> FpGadget<F> {
@@ -177,14 +177,6 @@ impl<F: PrimeField> FpGadget<F> {
Ok(()) Ok(())
} }
}
pub struct CmpGadget<ConstraintF: PrimeField> {
constraint_field_type: PhantomData<ConstraintF>,
}
impl<ConstraintF: PrimeField> CmpGadget<ConstraintF> {
} }
#[cfg(test)] #[cfg(test)]
@@ -225,14 +217,11 @@ mod test {
match a.cmp(&b) { match a.cmp(&b) {
Ordering::Less => { Ordering::Less => {
a_var.enforce_cmp( a_var
cs.ns(|| "smaller than test"), .enforce_cmp(cs.ns(|| "smaller than test"), &b_var, Ordering::Less, false)
&b_var,
Ordering::Less,
false,
)
.unwrap(); .unwrap();
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test 2"), cs.ns(|| "smaller than test 2"),
&b_var, &b_var,
Ordering::Less, Ordering::Less,
@@ -241,14 +230,16 @@ mod test {
.unwrap(); .unwrap();
}, },
Ordering::Greater => { Ordering::Greater => {
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test"), cs.ns(|| "smaller than test"),
&b_var, &b_var,
Ordering::Greater, Ordering::Greater,
false, false,
) )
.unwrap(); .unwrap();
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test 2"), cs.ns(|| "smaller than test 2"),
&b_var, &b_var,
Ordering::Greater, Ordering::Greater,
@@ -274,14 +265,11 @@ mod test {
match b.cmp(&a) { match b.cmp(&a) {
Ordering::Less => { Ordering::Less => {
a_var.enforce_cmp( a_var
cs.ns(|| "smaller than test"), .enforce_cmp(cs.ns(|| "smaller than test"), &b_var, Ordering::Less, false)
&b_var,
Ordering::Less,
false,
)
.unwrap(); .unwrap();
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test 2"), cs.ns(|| "smaller than test 2"),
&b_var, &b_var,
Ordering::Less, Ordering::Less,
@@ -290,14 +278,16 @@ mod test {
.unwrap(); .unwrap();
}, },
Ordering::Greater => { Ordering::Greater => {
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test"), cs.ns(|| "smaller than test"),
&b_var, &b_var,
Ordering::Greater, Ordering::Greater,
false, false,
) )
.unwrap(); .unwrap();
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than test 2"), cs.ns(|| "smaller than test 2"),
&b_var, &b_var,
Ordering::Greater, Ordering::Greater,
@@ -315,12 +305,8 @@ mod test {
let mut cs = TestConstraintSystem::<Fr>::new(); let mut cs = TestConstraintSystem::<Fr>::new();
let a = rand_in_range(&mut rng); let a = rand_in_range(&mut rng);
let a_var = FpGadget::<Fr>::alloc(cs.ns(|| "a"), || Ok(a)).unwrap(); let a_var = FpGadget::<Fr>::alloc(cs.ns(|| "a"), || Ok(a)).unwrap();
a_var.enforce_cmp( a_var
cs.ns(|| "smaller than test"), .enforce_cmp(cs.ns(|| "smaller than test"), &a_var, Ordering::Less, false)
&a_var,
Ordering::Less,
false,
)
.unwrap(); .unwrap();
assert!(!cs.is_satisfied()); assert!(!cs.is_satisfied());
@@ -330,7 +316,8 @@ mod test {
let mut cs = TestConstraintSystem::<Fr>::new(); let mut cs = TestConstraintSystem::<Fr>::new();
let a = rand_in_range(&mut rng); let a = rand_in_range(&mut rng);
let a_var = FpGadget::<Fr>::alloc(cs.ns(|| "a"), || Ok(a)).unwrap(); let a_var = FpGadget::<Fr>::alloc(cs.ns(|| "a"), || Ok(a)).unwrap();
a_var.enforce_cmp( a_var
.enforce_cmp(
cs.ns(|| "smaller than or equal to test"), cs.ns(|| "smaller than or equal to test"),
&a_var, &a_var,
Ordering::Less, Ordering::Less,