Add ff and group crates to Cargo workspace

zcash · Jan 6, 2019 · 482bef8 · 482bef8
1 parent b1ce390
commit 482bef8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" }