Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-02-23 14:15:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from plutomonkey/boolean_enforce_equal

Browse Source 
Optimise Boolean::enforce_equal.
This commit is contained in:
ebfull 2018-03-14 07:28:33 -06:00 committed by GitHub
commit 3c07a2d9b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 99 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/circuit/boolean.rs
View File

@ -375,35 +375,44 @@ impl Boolean {
where E: Engine, where E: Engine,
CS: ConstraintSystem<E> CS: ConstraintSystem<E>
{ {
let c = Self::xor(&mut cs, a, b)?; match (a, b) {
(&Boolean::Constant(a), &Boolean::Constant(b)) => {
match c { if a == b {
Boolean::Constant(false) => { Ok(())
Ok(()) } else {
Err(SynthesisError::Unsatisfiable)
}
}, },
Boolean::Constant(true) => { (&Boolean::Constant(true), a) | (a, &Boolean::Constant(true)) => {
Err(SynthesisError::Unsatisfiable)
},
Boolean::Is(ref res) => {
cs.enforce( cs.enforce(
|| "enforce equals zero", || "enforce equal to one",
|lc| lc, |lc| lc,
|lc| lc, |lc| lc,
|lc| lc + res.get_variable() |lc| lc + CS::one() - &a.lc(CS::one(), E::Fr::one())
); );
Ok(()) Ok(())
}, },
Boolean::Not(ref res) => { (&Boolean::Constant(false), a) | (a, &Boolean::Constant(false)) => {
cs.enforce( cs.enforce(
|| "enforce equals one", || "enforce equal to zero",
|lc| lc, |lc| lc,
|lc| lc, |lc| lc,
|lc| lc + CS::one() - res.get_variable() |_| a.lc(CS::one(), E::Fr::one())
); );
Ok(()) Ok(())
}, },
(a, b) => {
cs.enforce(
|| "enforce equal",
|lc| lc,
|lc| lc,
|_| a.lc(CS::one(), E::Fr::one()) - &b.lc(CS::one(), E::Fr::one())
);
Ok(())
}
} }
} }
@ -636,24 +645,88 @@ mod test {
for b_bool in [false, true].iter().cloned() { for b_bool in [false, true].iter().cloned() {
for a_neg in [false, true].iter().cloned() { for a_neg in [false, true].iter().cloned() {
for b_neg in [false, true].iter().cloned() { for b_neg in [false, true].iter().cloned() {
let mut cs = TestConstraintSystem::<Bls12>::new(); {
let mut cs = TestConstraintSystem::<Bls12>::new();
let mut a = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "a"), Some(a_bool)).unwrap()); let mut a = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "a"), Some(a_bool)).unwrap());
let mut b = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "b"), Some(b_bool)).unwrap()); let mut b = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "b"), Some(b_bool)).unwrap());
if a_neg { if a_neg {
a = a.not(); a = a.not();
}
if b_neg {
b = b.not();
}
Boolean::enforce_equal(&mut cs, &a, &b).unwrap();
assert_eq!(
cs.is_satisfied(),
(a_bool ^ a_neg) == (b_bool ^ b_neg)
);
} }
if b_neg { {
b = b.not(); let mut cs = TestConstraintSystem::<Bls12>::new();
let mut a = Boolean::Constant(a_bool);
let mut b = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "b"), Some(b_bool)).unwrap());
if a_neg {
a = a.not();
}
if b_neg {
b = b.not();
}
Boolean::enforce_equal(&mut cs, &a, &b).unwrap();
assert_eq!(
cs.is_satisfied(),
(a_bool ^ a_neg) == (b_bool ^ b_neg)
);
} }
{
let mut cs = TestConstraintSystem::<Bls12>::new();
Boolean::enforce_equal(&mut cs, &a, &b).unwrap(); let mut a = Boolean::from(AllocatedBit::alloc(cs.namespace(|| "a"), Some(a_bool)).unwrap());
let mut b = Boolean::Constant(b_bool);
assert_eq!( if a_neg {
cs.is_satisfied(), a = a.not();
(a_bool ^ a_neg) == (b_bool ^ b_neg) }
); if b_neg {
b = b.not();
}
Boolean::enforce_equal(&mut cs, &a, &b).unwrap();
assert_eq!(
cs.is_satisfied(),
(a_bool ^ a_neg) == (b_bool ^ b_neg)
);
}
{
let mut cs = TestConstraintSystem::<Bls12>::new();
let mut a = Boolean::Constant(a_bool);
let mut b = Boolean::Constant(b_bool);
if a_neg {
a = a.not();
}
if b_neg {
b = b.not();
}
let result = Boolean::enforce_equal(&mut cs, &a, &b);
if (a_bool ^ a_neg) == (b_bool ^ b_neg) {
assert!(result.is_ok());
assert!(cs.is_satisfied());
} else {
assert!(result.is_err());
}
}
} }
} }
} }