zecfoundation
/
bellman
mirror of https://github.com/ZcashFoundation/bellman.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor improvements

This commit is contained in:
Sean Bowe 2016-01-26 14:18:01 -07:00
parent ececc2b60b
commit da373758e5
3 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/bit.rs
View File

@ -206,6 +206,73 @@ pub enum Bit {
Bin(BinaryOp, bool)
}
fn binaryop_constraint(a: &Var, b: &Var, c: &Var, op: Op) -> Constraint {
match op {
// a * b = c
And => Constraint(vec![(FieldT::one(), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![(FieldT::one(), c.clone())]
),
// a * b = 1 - c
Nand => Constraint(vec![(FieldT::one(), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), c.clone())
]
),
// 2a * b = a + b - c
Xor => Constraint(vec![(FieldT::from(2), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![(FieldT::one(), a.clone()),
(FieldT::one(), b.clone()),
(-FieldT::one(), c.clone())
]
),
// 2a * b = a + b + c - 1
Xnor => Constraint(vec![(FieldT::from(2), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![
(FieldT::one(), a.clone()),
(FieldT::one(), b.clone()),
(FieldT::one(), c.clone()),
(-FieldT::one(), Var::one())
]
),
// a * (1 - b) = c
MaterialNonimplication => Constraint(vec![(FieldT::one(), a.clone())],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), b.clone())
],
vec![(FieldT::one(), c.clone())]
),
// a * b = a + c - 1
MaterialImplication => Constraint(vec![(FieldT::one(), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![(FieldT::one(), a.clone()),
(FieldT::one(), c.clone()),
(-FieldT::one(), Var::one())
]
),
// (1 - a) * (1 - b) = c
Nor => Constraint(vec![(FieldT::one(), Var::one()),
(-FieldT::one(), a.clone())
],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), b.clone())
],
vec![(FieldT::one(), c.clone())]
),
// a * b = a + b - c
Or => Constraint(vec![(FieldT::one(), a.clone())],
vec![(FieldT::one(), b.clone())],
vec![(FieldT::one(), a.clone()),
(FieldT::one(), b.clone()),
(-FieldT::one(), c.clone())
]
)
}
}
fn resolve(a: &Var, b: &Var, op: Op) -> Var {
gadget(&[a, b], 1, move |vals| {
let a = vals.get_input(0);
@ -213,70 +280,7 @@ fn resolve(a: &Var, b: &Var, op: Op) -> Var {
vals.set_output(0, op.val(a, b));
}, |i, o, cs| {
cs.push(match op {
// a * b = c
And => Constraint(vec![(FieldT::one(), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![(FieldT::one(), o[0].clone())]
),
// a * b = 1 - c
Nand => Constraint(vec![(FieldT::one(), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), o[0].clone())
]
),
// 2a * b = a + b - c
Xor => Constraint(vec![(FieldT::from(2), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![(FieldT::one(), i[0].clone()),
(FieldT::one(), i[1].clone()),
(-FieldT::one(), o[0].clone())
]
),
// 2a * b = a + b + c - 1
Xnor => Constraint(vec![(FieldT::from(2), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![
(FieldT::one(), i[0].clone()),
(FieldT::one(), i[1].clone()),
(FieldT::one(), o[0].clone()),
(-FieldT::one(), Var::one())
]
),
// a * (1 - b) = c
MaterialNonimplication => Constraint(vec![(FieldT::one(), i[0].clone())],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), i[1].clone())
],
vec![(FieldT::one(), o[0].clone())]
),
// a * b = a + c - 1
MaterialImplication => Constraint(vec![(FieldT::one(), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![(FieldT::one(), i[0].clone()),
(FieldT::one(), o[0].clone()),
(-FieldT::one(), Var::one())
]
),
// (1 - a) * (1 - b) = c
Nor => Constraint(vec![(FieldT::one(), Var::one()),
(-FieldT::one(), i[0].clone())
],
vec![(FieldT::one(), Var::one()),
(-FieldT::one(), i[1].clone())
],
vec![(FieldT::one(), o[0].clone())]
),
// a * b = a + b - c
Or => Constraint(vec![(FieldT::one(), i[0].clone())],
vec![(FieldT::one(), i[1].clone())],
vec![(FieldT::one(), i[0].clone()),
(FieldT::one(), i[1].clone()),
(-FieldT::one(), o[0].clone())
]
),
});
cs.push(binaryop_constraint(i[0], i[1], o[0], op));
vec![o[0]]
}).remove(0)

6
src/keccak.rs
View File

@ -313,12 +313,12 @@ pub struct Byte {
bits: Vec<Bit>
}
impl From<Vec<Bit>> for Byte {
fn from(a: Vec<Bit>) -> Byte {
impl<'a> From<&'a [Bit]> for Byte {
fn from(a: &'a [Bit]) -> Byte {
assert_eq!(8, a.len());
Byte {
bits: a
bits: a.to_owned()
}
}
}

2
src/variable.rs
View File

@ -160,7 +160,7 @@ pub fn gadget<W, C>(
// TODO: we should augment the gadget instead
// of replacing it
debug_assert!(a.gadget.is_none());
assert!(a.gadget.is_none());
a.gadget = Some(gadget.clone());
a