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

Remove warning and fix naming error

Browse source
This commit is contained in:
Guillaume Ballet 2019-01-03 18:29:07 +01:00
parent 8d7a09ebd6
commit 311ee6275f
6 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
plugins/partialeq_wasm/.gitignore → plugins/conditioneq_wasm/.gitignore vendored
View file

18
plugins/partialeq_wasm/Cargo.lock → plugins/conditioneq_wasm/Cargo.lock generated
View file

@ -13,6 +13,15 @@ name = "byteorder"
version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "conditioneq_wasm"
version = "0.1.0"
dependencies = [
"lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_field 0.3.0",
]
[[package]]
name = "lazy_static"
version = "0.1.16"
@ -67,15 +76,6 @@ name = "num-traits"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "partialeq_wasm"
version = "0.1.0"
dependencies = [
"lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_field 0.3.0",
]
[[package]]
name = "proc-macro2"
version = "0.4.24"

2
plugins/partialeq_wasm/Cargo.toml → plugins/conditioneq_wasm/Cargo.toml
View file

@ -1,5 +1,5 @@
[package]
name = "partialeq_wasm"
name = "conditioneq_wasm"
version = "0.1.0"
authors = ["Guillaume Ballet <gballet@gmail.com>"]
edition = "2018"

0
plugins/partialeq_wasm/src/main.rs → plugins/conditioneq_wasm/src/main.rs
View file

11
zokrates_core/build.rs
View file

@ -200,7 +200,7 @@ fn main() {
/* Build the WASM helpers and turn them into files */
let status = Command::new("cargo")
.current_dir("../plugins/partialeq_wasm")
.current_dir("../plugins/conditioneq_wasm")
.args(&["build", "--target", "wasm32-unknown-unknown", "--release"])
.status()
.unwrap();
@ -210,11 +210,11 @@ fn main() {
/* Turn the output binary into a source file for zokrates_core */
let fname =
"../plugins/partialeq_wasm/target/wasm32-unknown-unknown/release/partialeq_wasm.wasm";
"../plugins/conditioneq_wasm/target/wasm32-unknown-unknown/release/conditioneq_wasm.wasm";
match validate(fname) {
Ok(module) => {
let out_dir = env::var("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("partialeq_wasm.rs");
let dest_path = Path::new(&out_dir).join("conditioneq_wasm.rs");
let m0 = module.clone();
let m1 = add_global_if_missing(
"min_inputs",
@ -246,8 +246,9 @@ fn main() {
.write_all(
format!(
"
pub const PARTIALEQ_WASM : &'static [u8] = &{:?};
",
#[allow(dead_code)]
pub const CONDITIONEQ_WASM : &'static [u8] = &{:?};
",
buf
)
.as_bytes(),

2
zokrates_core/src/helpers/mod.rs
View file

@ -11,7 +11,7 @@ pub use self::wasm::WasmHelper;
use flat_absy::{FlatExpression, FlatVariable};
use std::fmt;
use zokrates_field::field::Field;
include!(concat!(env!("OUT_DIR"), "/partialeq_wasm.rs"));
include!(concat!(env!("OUT_DIR"), "/conditioneq_wasm.rs"));
#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
pub struct DirectiveStatement<T: Field> {