From 8c840f9566c820281a25c5a6f791b99ac2d97194 Mon Sep 17 00:00:00 2001 From: dark64 Date: Tue, 30 Jun 2020 12:43:23 +0200 Subject: [PATCH] remove default value for stdlib-path --- Cargo.lock | 76 +---------------------------------------- zokrates_cli/Cargo.toml | 1 - zokrates_cli/src/bin.rs | 6 +--- 3 files changed, 2 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a636c71..50b9d915 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,12 +18,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - [[package]] name = "arrayvec" version = "0.4.12" @@ -33,12 +27,6 @@ dependencies = [ "nodrop", ] -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - [[package]] name = "assert_cli" version = "0.5.4" @@ -92,12 +80,6 @@ dependencies = [ "libc", ] -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "bellman_ce" version = "0.3.4" @@ -144,22 +126,11 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdc60350286c7c3db13b98e91dbe5c8b6830a6821bc20af5b0c310ce94d74915" dependencies = [ - "arrayvec 0.4.12", + "arrayvec", "byteorder", "constant_time_eq", ] -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec 0.5.1", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -411,27 +382,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "dirs" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" -dependencies = [ - "cfg-if", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "either" version = "1.5.3" @@ -1190,17 +1140,6 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - [[package]] name = "reduce" version = "0.1.2" @@ -1247,18 +1186,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rustc-demangle" version = "0.1.16" @@ -1781,7 +1708,6 @@ dependencies = [ "assert_cli", "bincode", "clap", - "dirs", "fs_extra", "glob 0.2.11", "regex", diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index 8fc34242..f6984179 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -18,7 +18,6 @@ zokrates_abi = { version = "0.1", path = "../zokrates_abi" } zokrates_core = { version = "0.4", path = "../zokrates_core" } zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver"} serde_json = "1.0" -dirs = "3.0" [dev-dependencies] glob = "0.2.11" diff --git a/zokrates_cli/src/bin.rs b/zokrates_cli/src/bin.rs index 9549ad62..c44842c9 100644 --- a/zokrates_cli/src/bin.rs +++ b/zokrates_cli/src/bin.rs @@ -4,8 +4,6 @@ // @author Dennis Kuhnert // @date 2017 -extern crate dirs; - mod constants; use constants::*; @@ -417,7 +415,6 @@ fn cli() -> Result<(), String> { const WITNESS_DEFAULT_PATH: &str = "witness"; const JSON_PROOF_PATH: &str = "proof.json"; - let default_stdlib_path: PathBuf = dirs::home_dir().unwrap().join(".zokrates/stdlib"); let default_curve = env::var("ZOKRATES_CURVE").unwrap_or(constants::BN128.into()); let default_scheme = env::var("ZOKRATES_PROVING_SCHEME").unwrap_or(constants::G16.into()); let default_solidity_abi = "v1"; @@ -442,8 +439,7 @@ fn cli() -> Result<(), String> { .help("Path to the standard library") .value_name("PATH") .takes_value(true) - .required(false) - .default_value(default_stdlib_path.to_str().unwrap()) + .required(true) ).arg(Arg::with_name("abi_spec") .short("s") .long("abi_spec")