removes unused struct + fmt

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

View File

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