github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

fix conflicts

Browse source
This commit is contained in:
schaeff 2022-07-05 20:21:46 +02:00
parent 2a77d22151
commit 4eb7b99cc3
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zokrates_circom/src/r1cs.rs
View file

@ -69,6 +69,7 @@ pub fn r1cs_program<T: Field>(prog: Prog<T>) -> (Vec<Variable>, usize, Vec<Const
for (quad, lin) in prog.statements.iter().filter_map(|s| match s { for (quad, lin) in prog.statements.iter().filter_map(|s| match s {
Statement::Constraint(quad, lin, _) => Some((quad, lin)), Statement::Constraint(quad, lin, _) => Some((quad, lin)),
Statement::Directive(..) => None, Statement::Directive(..) => None,
Statement::Log(..) => None,
}) { }) {
for (k, _) in &quad.left.0 { for (k, _) in &quad.left.0 {
provide_variable_idx(&mut variables, k); provide_variable_idx(&mut variables, k);
@ -87,6 +88,7 @@ pub fn r1cs_program<T: Field>(prog: Prog<T>) -> (Vec<Variable>, usize, Vec<Const
for (quad, lin) in prog.statements.into_iter().filter_map(|s| match s { for (quad, lin) in prog.statements.into_iter().filter_map(|s| match s {
Statement::Constraint(quad, lin, _) => Some((quad, lin)), Statement::Constraint(quad, lin, _) => Some((quad, lin)),
Statement::Directive(..) => None, Statement::Directive(..) => None,
Statement::Log(..) => None,
}) { }) {
constraints.push(( constraints.push((
quad.left quad.left

3
zokrates_js/tests/tests.js
View file

@ -28,12 +28,9 @@ describe("tests", () => {
it("should compile", () => { it("should compile", () => {
assert.doesNotThrow(() => { assert.doesNotThrow(() => {
console.log(zokratesProvider.compile)
const artifacts = zokratesProvider.compile( const artifacts = zokratesProvider.compile(
"def main() -> field { return 42; }" "def main() -> field { return 42; }"
); );
console.log(artifacts);
assert.ok(artifacts !== undefined); assert.ok(artifacts !== undefined);
assert.ok(artifacts.snarkjs === undefined); assert.ok(artifacts.snarkjs === undefined);
}); });