cargo fmt

QED-it · Jun 20, 2019 · 226dc0f · 226dc0f
1 parent 82a1990
commit 226dc0f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/zkif-wasm-bundles/zkif-wasm-bulletproofs/src/backend_bulletproofs.rs b/zkif-wasm-bundles/zkif-wasm-bulletproofs/src/backend_bulletproofs.rs
@@ -1,10 +1,6 @@
+use bulletproofs::r1cs::{zkinterface_backend, R1CSProof};
 use wasm_bindgen::prelude::wasm_bindgen;
 use zkinterface::reading::Messages;
-use bulletproofs::r1cs::{
-    R1CSProof,
-    zkinterface_backend,
-};
-
 
 /// Prove using the circuit and the witness.
 #[wasm_bindgen]
@@ -18,7 +14,6 @@ pub fn prove(circuit: &[u8], witness: &[u8]) -> Vec<u8> {
     bincode::serialize(&proof).unwrap()
 }
 
-
 /// Verify using the circuit and the proof.
 #[wasm_bindgen]
 pub fn verify(circuit: &[u8], inputs: &[u8], proof_ser: &[u8]) -> bool {

diff --git a/zkif-wasm-bundles/zkif-wasm-bulletproofs/src/lib.rs b/zkif-wasm-bundles/zkif-wasm-bulletproofs/src/lib.rs
@@ -9,7 +9,7 @@ use wasm_bindgen::prelude::*;
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
-extern {
+extern "C" {
     #[wasm_bindgen(js_namespace = console)]
     fn error(msg: String);
     #[wasm_bindgen(js_namespace = console)]
@@ -19,5 +19,5 @@ extern {
 #[wasm_bindgen(start)]
 pub fn start() {
     #[cfg(feature = "console_error_panic_hook")]
-        console_error_panic_hook::set_once();
+    console_error_panic_hook::set_once();
 }
diff --git a/zkif-wasm-bundles/zkif-wasm-example/src/frontend.rs b/zkif-wasm-bundles/zkif-wasm-example/src/frontend.rs
@@ -1,6 +1,6 @@
 use wasm_bindgen::prelude::wasm_bindgen;
-use zkinterface::{
-    examples::{example_circuit_inputs, write_example_constraints, write_example_witness_inputs},
+use zkinterface::examples::{
+    example_circuit_inputs, write_example_constraints, write_example_witness_inputs,
 };
 
 /// Generate a test circuit constraints.
@@ -15,7 +15,6 @@ pub fn make_circuit(x: u32, y: u32, zz: u32) -> Vec<u8> {
     msg
 }
 
-
 /// Generate a witness.
 #[wasm_bindgen]
 pub fn make_witness(x: u32, y: u32) -> Vec<u8> {

diff --git a/zkif-wasm-bundles/zkif-wasm-example/src/lib.rs b/zkif-wasm-bundles/zkif-wasm-example/src/lib.rs
@@ -9,7 +9,7 @@ use wasm_bindgen::prelude::*;
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
-extern {
+extern "C" {
     #[wasm_bindgen(js_namespace = console)]
     fn error(msg: String);
     #[wasm_bindgen(js_namespace = console)]
@@ -19,5 +19,5 @@ extern {
 #[wasm_bindgen(start)]
 pub fn start() {
     #[cfg(feature = "console_error_panic_hook")]
-        console_error_panic_hook::set_once();
+    console_error_panic_hook::set_once();
 }
diff --git a/zkif-wasm-bundles/zkif-wasm-zokrates/src/frontend.rs b/zkif-wasm-bundles/zkif-wasm-zokrates/src/frontend.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
-use wasm_bindgen::prelude::{JsValue, wasm_bindgen};
+use wasm_bindgen::prelude::{wasm_bindgen, JsValue};
 use zkinterface::{
-    reading::{Messages, split_messages},
+    reading::{split_messages, Messages},
     zkinterface_generated::zkinterface::get_size_prefixed_root_as_root,
 };
 use zokrates_core::{
@@ -11,10 +11,8 @@ use zokrates_core::{
 };
 use zokrates_field::field::FieldPrime;
 
-
 fn compile_prog(code: &str) -> Prog<FieldPrime> {
-    compile::<FieldPrime, &[u8], &[u8], std::io::Error>(
-        &mut code.as_bytes(), None, None).unwrap()
+    compile::<FieldPrime, &[u8], &[u8], std::io::Error>(&mut code.as_bytes(), None, None).unwrap()
 }
 
 /// Generate a constraint system.
@@ -42,7 +40,11 @@ pub fn make_witness(code: &str, x: u32, y: u32) -> JsValue /* Instance */ {
 
     let verifier_msg = get_verifier_msg(&prover_msg).unwrap();
 
-    JsValue::from_serde(&Instance { prover_msg, verifier_msg }).unwrap()
+    JsValue::from_serde(&Instance {
+        prover_msg,
+        verifier_msg,
+    })
+    .unwrap()
 }
 
 #[derive(Serialize)]

diff --git a/zkif-wasm-bundles/zkif-wasm-zokrates/src/lib.rs b/zkif-wasm-bundles/zkif-wasm-zokrates/src/lib.rs
@@ -12,7 +12,7 @@ extern crate serde_derive;
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
-extern {
+extern "C" {
     #[wasm_bindgen(js_namespace = console)]
     fn error(msg: String);
     #[wasm_bindgen(js_namespace = console)]
@@ -22,5 +22,5 @@ extern {
 #[wasm_bindgen(start)]
 pub fn start() {
     #[cfg(feature = "console_error_panic_hook")]
-        console_error_panic_hook::set_once();
+    console_error_panic_hook::set_once();
 }