arnaucube/ark-r1cs-std
1
0
Fork 0
mirror of https://github.com/arnaucube/ark-r1cs-std.git synced 2026-01-10 16:01:28 +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

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

@@ -4,11 +4,11 @@ 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> {
fn process_cmp_inputs<CS: ConstraintSystem<F>>( fn process_cmp_inputs<CS: ConstraintSystem<F>>(
mut cs: CS, mut cs: CS,
a: &FpGadget<F>, a: &FpGadget<F>,
b: &FpGadget<F>, b: &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,36 +217,35 @@ 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, .unwrap();
Ordering::Less, a_var
false, .enforce_cmp(
) cs.ns(|| "smaller than test 2"),
.unwrap(); &b_var,
a_var.enforce_cmp( Ordering::Less,
cs.ns(|| "smaller than test 2"), true,
&b_var, )
Ordering::Less, .unwrap();
true,
)
.unwrap();
}, },
Ordering::Greater => { Ordering::Greater => {
a_var.enforce_cmp( a_var
cs.ns(|| "smaller than test"), .enforce_cmp(
&b_var, cs.ns(|| "smaller than test"),
Ordering::Greater, &b_var,
false, Ordering::Greater,
) false,
.unwrap(); )
a_var.enforce_cmp( .unwrap();
cs.ns(|| "smaller than test 2"), a_var
&b_var, .enforce_cmp(
Ordering::Greater, cs.ns(|| "smaller than test 2"),
true, &b_var,
) Ordering::Greater,
.unwrap(); true,
)
.unwrap();
}, },
_ => {}, _ => {},
} }
@@ -274,36 +265,35 @@ 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, .unwrap();
Ordering::Less, a_var
false, .enforce_cmp(
) cs.ns(|| "smaller than test 2"),
.unwrap(); &b_var,
a_var.enforce_cmp( Ordering::Less,
cs.ns(|| "smaller than test 2"), true,
&b_var, )
Ordering::Less, .unwrap();
true,
)
.unwrap();
}, },
Ordering::Greater => { Ordering::Greater => {
a_var.enforce_cmp( a_var
cs.ns(|| "smaller than test"), .enforce_cmp(
&b_var, cs.ns(|| "smaller than test"),
Ordering::Greater, &b_var,
false, Ordering::Greater,
) false,
.unwrap(); )
a_var.enforce_cmp( .unwrap();
cs.ns(|| "smaller than test 2"), a_var
&b_var, .enforce_cmp(
Ordering::Greater, cs.ns(|| "smaller than test 2"),
true, &b_var,
) Ordering::Greater,
.unwrap(); true,
)
.unwrap();
}, },
_ => {}, _ => {},
} }
@@ -315,13 +305,9 @@ 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, .unwrap();
Ordering::Less,
false,
)
.unwrap();
assert!(!cs.is_satisfied()); assert!(!cs.is_satisfied());
} }
@@ -330,13 +316,14 @@ 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 or equal to test"), .enforce_cmp(
&a_var, cs.ns(|| "smaller than or equal to test"),
Ordering::Less, &a_var,
true, Ordering::Less,
) true,
.unwrap(); )
.unwrap();
assert!(cs.is_satisfied()); assert!(cs.is_satisfied());
} }

2
r1cs-std/src/fields/fp/mod.rs
View File

@@ -627,4 +627,4 @@ impl<F: PrimeField> AllocGadget<F, F> for FpGadget<F> {
variable: Var(variable), variable: Var(variable),
}) })
} }
} }