From 2ce56e1e3636d63a24550455d3984e126985f06d Mon Sep 17 00:00:00 2001 From: sdeml Date: Tue, 15 Jan 2019 12:01:03 +0100 Subject: [PATCH] more fmt fixes --- zokrates_core/src/helpers/libsnark_gadget.rs | 4 ++-- zokrates_core/src/helpers/mod.rs | 14 +++++++------- zokrates_core/src/imports.rs | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/zokrates_core/src/helpers/libsnark_gadget.rs b/zokrates_core/src/helpers/libsnark_gadget.rs index 27fea433..3daff33f 100644 --- a/zokrates_core/src/helpers/libsnark_gadget.rs +++ b/zokrates_core/src/helpers/libsnark_gadget.rs @@ -1,5 +1,5 @@ use helpers::{Executable, Signed}; -use libsnark::{get_sha256round_witness}; +use libsnark::get_sha256round_witness; use serde_json; use standard; use std::fmt; @@ -29,7 +29,7 @@ impl Executable for LibsnarkGadgetHelper { if let Err(e) = witness_result { return Err(format!("{}", e)); } - + Ok(witness_result .unwrap() .variables diff --git a/zokrates_core/src/helpers/mod.rs b/zokrates_core/src/helpers/mod.rs index 19546720..dfd8c000 100644 --- a/zokrates_core/src/helpers/mod.rs +++ b/zokrates_core/src/helpers/mod.rs @@ -146,14 +146,14 @@ mod tests { 0, 0, 1, 1, 1, 1, 1, 1, // append SHA256 IV vector (https://en.wikipedia.org/wiki/SHA-2) 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, - 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, + 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, - 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, - 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, - 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, - 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, + 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, + 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, + 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, ]; let r = sha diff --git a/zokrates_core/src/imports.rs b/zokrates_core/src/imports.rs index f2fd67d8..87d0ef51 100644 --- a/zokrates_core/src/imports.rs +++ b/zokrates_core/src/imports.rs @@ -130,7 +130,6 @@ impl Importer { use libsnark::get_sha256round_constraints; use serde_json::from_str; use standard::{DirectiveR1CS, R1CS}; - use std::io::BufReader; match import.source.as_ref() { "LIBSNARK/sha256round" => {