From 62e933d001065b77b60ade3ab2d4aaf8a36dff39 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 1 Jul 2021 17:15:32 +0200 Subject: [PATCH] fix zjs --- zokrates_core/tests/wasm.rs | 4 ++-- zokrates_js/Cargo.lock | 6 +++--- zokrates_js/src/lib.rs | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/zokrates_core/tests/wasm.rs b/zokrates_core/tests/wasm.rs index 6554beb0..265c78e1 100644 --- a/zokrates_core/tests/wasm.rs +++ b/zokrates_core/tests/wasm.rs @@ -6,7 +6,7 @@ extern crate zokrates_field; use wasm_bindgen_test::*; use zokrates_core::flat_absy::FlatVariable; use zokrates_core::ir::{Function, Interpreter, Prog, Statement}; -use zokrates_core::proof_system::Backend; +use zokrates_core::proof_system::{Backend, NonUniversalBackend}; use zokrates_field::Bn128Field; use zokrates_core::proof_system::bellman::Bellman; @@ -32,7 +32,7 @@ fn generate_proof() { .execute(&program, &[Bn128Field::from(42)]) .unwrap(); - let keypair = >::setup(program.clone()); + let keypair = >::setup(program.clone()); let _proof = >::generate_proof(program, witness, keypair.pk); } diff --git a/zokrates_js/Cargo.lock b/zokrates_js/Cargo.lock index 27026784..2566ac33 100644 --- a/zokrates_js/Cargo.lock +++ b/zokrates_js/Cargo.lock @@ -1164,7 +1164,7 @@ version = "0.1.0" [[package]] name = "zokrates_core" -version = "0.6.3" +version = "0.6.4" dependencies = [ "bellman_ce", "bincode", @@ -1192,7 +1192,7 @@ dependencies = [ [[package]] name = "zokrates_embed" -version = "0.1.2" +version = "0.1.3" dependencies = [ "bellman_ce", "sapling-crypto_ce", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "zokrates_js" -version = "1.0.32" +version = "1.0.33" dependencies = [ "console_error_panic_hook", "js-sys", diff --git a/zokrates_js/src/lib.rs b/zokrates_js/src/lib.rs index cdf98ae2..572c95c7 100644 --- a/zokrates_js/src/lib.rs +++ b/zokrates_js/src/lib.rs @@ -12,7 +12,9 @@ use zokrates_core::imports::Error; use zokrates_core::ir; use zokrates_core::proof_system::bellman::Bellman; use zokrates_core::proof_system::groth16::G16; -use zokrates_core::proof_system::{Backend, Proof, Scheme, SolidityAbi, SolidityCompatibleScheme}; +use zokrates_core::proof_system::{ + Backend, NonUniversalBackend, Proof, Scheme, SolidityAbi, SolidityCompatibleScheme, +}; use zokrates_core::typed_absy::abi::Abi; use zokrates_core::typed_absy::types::ConcreteSignature as Signature; use zokrates_field::Bn128Field; @@ -162,7 +164,7 @@ pub fn compute_witness(program: &[u8], abi: JsValue, args: JsValue) -> Result Result { let program_flattened = deserialize_program(program)?; - let keypair = >::setup(program_flattened); + let keypair = >::setup(program_flattened); Ok(JsValue::from_serde(&keypair).unwrap()) }