Make libraries compile
Pratyush Mishra pratyushmishra@berkeley.edu
Sun, 19 Jan 2020 20:13:49 -0800
2 files changed,
7 insertions(+),
6 deletions(-)
M
r1cs-std/src/bits/boolean.rs
→
r1cs-std/src/bits/boolean.rs
@@ -308,7 +308,7 @@ })
} } -impl<ConstraintF: Field> CondSelectGadget<ConstraintF> for AllocatedBit { +impl<ConstraintF: PrimeField> CondSelectGadget<ConstraintF> for AllocatedBit { fn conditionally_select<CS: ConstraintSystem<ConstraintF>>( cs: CS, cond: &Boolean,@@ -328,7 +328,7 @@ 1
} } -fn cond_select_helper<F: Field, CS: ConstraintSystem<F>>( +fn cond_select_helper<F: PrimeField, CS: ConstraintSystem<F>>( mut cs: CS, cond: &Boolean, first: (Option<bool>, impl Into<ConstraintVar<F>>),@@ -785,7 +785,8 @@ ) -> Result<Vec<UInt8>, SynthesisError> {
self.to_bytes(cs) } } -impl<ConstraintF: Field> CondSelectGadget<ConstraintF> for Boolean { + +impl<ConstraintF: PrimeField> CondSelectGadget<ConstraintF> for Boolean { fn conditionally_select<CS>( mut cs: CS, cond: &Self,
M
r1cs-std/src/groups/curves/short_weierstrass/mod.rs
→
r1cs-std/src/groups/curves/short_weierstrass/mod.rs
@@ -91,7 +91,7 @@ impl<P, ConstraintF, F> GroupGadget<SWProjective<P>, ConstraintF>
for AffineGadget<P, ConstraintF, F> where P: SWModelParameters, - ConstraintF: Field, + ConstraintF: PrimeField, F: FieldGadget<P::BaseField, ConstraintF>, { type Value = SWProjective<P>;@@ -329,7 +329,7 @@
impl<P, ConstraintF, F> CondSelectGadget<ConstraintF> for AffineGadget<P, ConstraintF, F> where P: SWModelParameters, - ConstraintF: Field, + ConstraintF: PrimeField, F: FieldGadget<P::BaseField, ConstraintF>, { #[inline]@@ -424,7 +424,7 @@ impl<P, ConstraintF, F> AllocGadget<SWProjective<P>, ConstraintF>
for AffineGadget<P, ConstraintF, F> where P: SWModelParameters, - ConstraintF: Field, + ConstraintF: PrimeField, F: FieldGadget<P::BaseField, ConstraintF>, { #[inline]