From 482bef87f07782f87cc5f60b293699205276173b Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 6 Jan 2019 09:50:07 +0000 Subject: [PATCH] Add ff and group crates to Cargo workspace --- Cargo.lock | 28 +++++++++++----------------- Cargo.toml | 2 ++ bellman/Cargo.toml | 4 ++-- group/Cargo.toml | 2 +- librustzcash/Cargo.toml | 2 +- pairing/Cargo.toml | 4 ++-- pairing/src/lib.rs | 1 - sapling-crypto/Cargo.toml | 2 +- zcash_primitives/Cargo.toml | 2 +- zcash_proofs/Cargo.toml | 2 +- zip32/Cargo.toml | 2 +- 11 files changed, 23 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ad85ce..a754c35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,10 +43,10 @@ dependencies = [ "bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "group 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "group 0.1.0", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pairing 0.14.2", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -111,17 +111,15 @@ dependencies = [ [[package]] name = "ff" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff_derive 0.3.0", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ff_derive" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-bigint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", @@ -187,9 +185,8 @@ dependencies = [ [[package]] name = "group" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -227,7 +224,7 @@ dependencies = [ "bellman 0.1.0", "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", "pairing 0.14.2", @@ -282,8 +279,8 @@ name = "pairing" version = "0.14.2" dependencies = [ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "group 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", + "group 0.1.0", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -366,7 +363,7 @@ dependencies = [ "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pairing 0.14.2", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -436,7 +433,7 @@ version = "0.0.0" dependencies = [ "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "pairing 0.14.2", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -449,7 +446,7 @@ version = "0.0.0" dependencies = [ "bellman 0.1.0", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "pairing 0.14.2", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "sapling-crypto 0.0.1", @@ -466,7 +463,7 @@ dependencies = [ "aes 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff 0.4.0", "fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "pairing 0.14.2", @@ -487,8 +484,6 @@ dependencies = [ "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" "checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19" "checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603" -"checksum ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eec81e2e423086589b224dbcfbab70e3732913de25479d05165b20d4aaed05f4" -"checksum ff_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70335090ee115d5716416ca38980cce7752f40923f41d22cf5a69a6269f9e2a2" "checksum fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce3371c82bfbd984f624cab093f55e7336f5a6e589f8518e1258f54f011b89ad" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" @@ -496,7 +491,6 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" -"checksum group 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5fa874cb11ddaf7cf45b511138f24169985d61d8760779426016230d11101d1a" "checksum hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4da5f0e01bd8a71a224a4eedecaacfcabda388dbb7a80faf04d3514287572d95" "checksum hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d340b6514f232f6db1bd16db65302a5278a04fef9ce867cb932e7e5fa21130a" "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" diff --git a/Cargo.toml b/Cargo.toml index 3d1363d..f25ea72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,8 @@ [workspace] members = [ "bellman", + "ff", + "group", "librustzcash", "pairing", "sapling-crypto", diff --git a/bellman/Cargo.toml b/bellman/Cargo.toml index 6812a7f..9ba6de4 100644 --- a/bellman/Cargo.toml +++ b/bellman/Cargo.toml @@ -11,10 +11,10 @@ version = "0.1.0" [dependencies] rand = "0.4" bit-vec = "0.4.4" -ff = "0.4" +ff = { path = "../ff" } futures = "0.1" futures-cpupool = "0.1" -group = "0.1" +group = { path = "../group" } num_cpus = "1" crossbeam = "0.3" pairing = { path = "../pairing", optional = true } diff --git a/group/Cargo.toml b/group/Cargo.toml index 92c2870..ad3f84d 100644 --- a/group/Cargo.toml +++ b/group/Cargo.toml @@ -13,5 +13,5 @@ homepage = "https://github.com/ebfull/group" repository = "https://github.com/ebfull/group" [dependencies] -ff = "0.4" +ff = { path = "../ff" } rand = "0.4" diff --git a/librustzcash/Cargo.toml b/librustzcash/Cargo.toml index 7476fdd..c2ab7ff 100644 --- a/librustzcash/Cargo.toml +++ b/librustzcash/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["staticlib"] [dependencies] bellman = { path = "../bellman" } -ff = "0.4" +ff = { path = "../ff" } libc = "0.2" pairing = { path = "../pairing" } lazy_static = "1" diff --git a/pairing/Cargo.toml b/pairing/Cargo.toml index 68971c3..3446f46 100644 --- a/pairing/Cargo.toml +++ b/pairing/Cargo.toml @@ -17,8 +17,8 @@ repository = "https://github.com/ebfull/pairing" [dependencies] rand = "0.4" byteorder = "1" -ff = { version = "0.4", features = ["derive"] } -group = "0.1" +ff = { path = "../ff", features = ["derive"] } +group = { path = "../group" } [features] unstable-features = ["expose-arith"] diff --git a/pairing/src/lib.rs b/pairing/src/lib.rs index adabcce..686938f 100644 --- a/pairing/src/lib.rs +++ b/pairing/src/lib.rs @@ -12,7 +12,6 @@ #![deny(missing_debug_implementations)] extern crate byteorder; -#[macro_use] extern crate ff; extern crate group; extern crate rand; diff --git a/sapling-crypto/Cargo.toml b/sapling-crypto/Cargo.toml index 626919f..d985219 100644 --- a/sapling-crypto/Cargo.toml +++ b/sapling-crypto/Cargo.toml @@ -14,7 +14,7 @@ features = ["expose-arith"] [dependencies] bellman = { path = "../bellman" } -ff = "0.4" +ff = { path = "../ff" } rand = "0.4" digest = "0.7" byteorder = "1" diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index ac03334..01e5243 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -7,7 +7,7 @@ authors = [ [dependencies] byteorder = "1" -ff = "0.4" +ff = { path = "../ff" } lazy_static = "1" pairing = { path = "../pairing" } rand = "0.4" diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 88cc5fb..ac1fd6b 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -8,7 +8,7 @@ authors = [ [dependencies] bellman = { path = "../bellman" } byteorder = "1" -ff = "0.4" +ff = { path = "../ff" } pairing = { path = "../pairing" } rand = "0.4" sapling-crypto = { path = "../sapling-crypto" } diff --git a/zip32/Cargo.toml b/zip32/Cargo.toml index 49ae186..0cee23d 100644 --- a/zip32/Cargo.toml +++ b/zip32/Cargo.toml @@ -14,7 +14,7 @@ repository = "https://github.com/zcash-hackworks/zip32" [dependencies] aes = "0.2" byteorder = "1" -ff = "0.4" +ff = { path = "../ff" } fpe = "0.1" lazy_static = "1.0" pairing = { path = "../pairing" }