chore: use workspace inheritance for dependencies (#1760)

Make shared dependencies clearer.

Closes #1645.

Author: kamuik16

Cargo.toml

@@ -1,14 +1,62 @@
 [workspace]
-
 members = [
+  "fil-proofs-param",
+  "fil-proofs-tooling",
+  "filecoin-hashers",
   "filecoin-proofs",
+  "fr32",
+  "sha2raw",
   "storage-proofs-core",
   "storage-proofs-porep",
   "storage-proofs-post",
-  "fil-proofs-tooling",
-  "fil-proofs-param",
-  "fr32",
-  "sha2raw",
-  "filecoin-hashers",
   "storage-proofs-update",
 ]
+
+[workspace.dependencies]
+fil-proofs-param = { path = "fil-proofs-param", default-features = false, version = "~13.1.0" }
+fil-proofs-tooling = { path = "fil-proofs-tooling", default-features = false, version = "~18.1.0" }
+filecoin-hashers = { path = "filecoin-hashers", default-features = false, version = "~13.1.0" }
+filecoin-proofs = { path = "filecoin-proofs", default-features = false, version = "~18.1.0" }
+fr32 = { path = "fr32", default-features = false, version = "~11.1.0" }
+sha2raw = { path = "sha2raw", default-features = false, version = "~13.1.0" }
+storage-proofs-core = { path = "storage-proofs-core", default-features = false, version = "~18.1.0" }
+storage-proofs-porep = { path = "storage-proofs-porep", default-features = false, version = "~18.1.0" }
+storage-proofs-post = { path = "storage-proofs-post", default-features = false, version = "~18.1.0" }
+storage-proofs-update = { path = "storage-proofs-update", default-features = false, version = "~18.1.0" }
+# Sorted alphabetically
+anyhow = "1.0.23"
+bellperson = "0.26.0"
+bincode = "1.1.2"
+blake2b_simd = "1.0.0"
+blake2s_simd = "1.0.0"
+blstrs = "0.7.0"
+byte-slice-cast = "1.0.0"
+byteorder = "1.3.4"
+cpu-time = "1.0.0"
+criterion = "0.3.2"
+dialoguer = "0.10.0"
+fdlimit = "0.2.0"
+ff = "0.13.0"
+fil_logger = "0.1.6"
+generic-array = "0.14.4"
+gperftools = "0.2"
+hex = "0.4.2"
+humansize = "1.1.0"
+itertools = "0.10.3"
+lazy_static = "1.2"
+log = "0.4.7"
+memmap2 = "0.5.6"
+merkletree = "0.23.0"
+neptune = { version = "11.0.0", features = ["bls", "arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+num_cpus = "1.10.1"
+pretty_assertions = "1.2.0"
+rand = "0.8"
+rand_xorshift = "0.3.0"
+rayon = "1.3.0"
+serde = "1.0"
+serde_json = "1.0"
+sha2 = "0.10.2"
+structopt = "0.3.12"
+tempfile = "3"
+thiserror = "1.0.6"
+typenum = "1.11.2"

fil-proofs-param/Cargo.toml

@@ -9,38 +9,36 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-storage-proofs-core = { path = "../storage-proofs-core", version = "~18.1.0", default-features = false}
-storage-proofs-porep = { path = "../storage-proofs-porep", version = "~18.1.0", default-features = false }
-storage-proofs-post = { path = "../storage-proofs-post", version = "~18.1.0", default-features = false }
-storage-proofs-update = { path = "../storage-proofs-update", version = "~18.1.0", default-features = false }
-filecoin-proofs = { version = "~18.1.0", path = "../filecoin-proofs", default-features = false }
-rand = "0.8"
-lazy_static = "1.2"
-pbr = "1.0"
-itertools = "0.10.3"
-serde_json = "1.0"
-blake2b_simd = "1.0.0"
-log = "0.4.7"
-fil_logger = "0.1.6"
+filecoin-proofs.workspace = true
+storage-proofs-core.workspace = true
+storage-proofs-porep.workspace = true
+storage-proofs-post.workspace = true
+storage-proofs-update.workspace = true
+# Sorted alphabetically
+anyhow.workspace = true
+blake2b_simd.workspace = true
+dialoguer.workspace = true
 env_proxy = "0.4"
-flate2 = { version = "1.0.9", features = ["rust_backend"]}
-tar = "0.4.26"
-anyhow = "1.0.23"
-gperftools = { version = "0.2", optional = true }
-structopt = "0.3.12"
-humansize = "1.1.0"
+fil_logger.workspace = true
+flate2 = { version = "1.0.9", features = ["rust_backend"] }
+gperftools = { workspace = true, optional = true }
+humansize.workspace = true
 indicatif = "0.16.2"
-dialoguer = "0.10.0"
-
-[dependencies.reqwest]
-version = "0.11.10"
-default-features = false
-features = ["blocking", "native-tls-vendored"]
+itertools.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+pbr = "1.0"
+rand.workspace = true
+reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "native-tls-vendored"] }
+serde_json.workspace = true
+structopt.workspace = true
+tar = "0.4.26"
 
 [dev-dependencies]
-rexpect = "0.4.0"
+# Sorted alphabetically
+tempfile.workspace = true
 failure = "0.1.7"
-tempfile = "3"
+rexpect = "0.4.0"
 
 [features]
 default = ["opencl"]

fil-proofs-tooling/Cargo.toml

@@ -10,42 +10,43 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-storage-proofs-core = { path = "../storage-proofs-core", version = "~18.1.0", default-features = false}
-storage-proofs-porep = { path = "../storage-proofs-porep", version = "~18.1.0", default-features = false }
-storage-proofs-post = { path = "../storage-proofs-post", version = "~18.1.0", default-features = false }
-filecoin-proofs = { path = "../filecoin-proofs", version = "~18.1.0", default-features = false }
-filecoin-hashers = { path = "../filecoin-hashers", version = "~13.1.0", default-features = false, features = ["poseidon", "blake2s", "sha256"] }
+storage-proofs-core.workspace = true
+storage-proofs-porep.workspace = true
+storage-proofs-post.workspace = true
+filecoin-proofs.workspace = true
+filecoin-hashers = { workspace = true, features = ["poseidon", "blake2s", "sha256"] }
+# Sorted alphabetically
+anyhow.workspace = true
+bellperson.workspace = true
+bincode.workspace = true
+blake2s_simd.workspace = true
+blstrs.workspace = true
+byte-unit = "4.0.14"
+bytefmt = "0.1.7"
+chrono = { version = "0.4.7", features = ["serde"] }
 clap = { version = "3.1.6", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-regex = "1.3.7"
 commandspec = "0.12.2"
-chrono = { version = "0.4.7", features = ["serde"] }
-memmap2 = "0.5.6"
-bellperson = "0.26.0"
-rand = "0.8"
-tempfile = "3.0.8"
-cpu-time = "1.0.0"
-blake2s_simd = "1.0.0"
-fil_logger = "0.1.6"
-log = "0.4.8"
-merkletree = "0.23.0"
-bincode = "1.1.2"
-anyhow = "1.0.23"
-rand_xorshift = "0.3.0"
-bytefmt = "0.1.7"
-rayon = "1.3.0"
+cpu-time.workspace = true
+dialoguer.workspace = true
+fdlimit.workspace = true
+fil_logger.workspace = true
 flexi_logger = "0.22.3"
-typenum = "1.11.2"
-generic-array = "0.14.4"
-byte-unit = "4.0.14"
-fdlimit = "0.2.0"
-dialoguer = "0.10.0"
-structopt = "0.3.12"
-humansize = "1.1.0"
-blstrs = "0.7.0"
-time = "0.3.9"
+generic-array.workspace = true
+humansize.workspace = true
+log.workspace = true
+memmap2.workspace = true
+merkletree.workspace = true
+rand.workspace = true
+rand_xorshift.workspace = true
+rayon.workspace = true
+regex = "1.3.7"
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+structopt.workspace = true
 sysinfo = { version = "0.28.4", default-features = false }
+tempfile.workspace = true
+time = "0.3.9"
+typenum.workspace = true
 
 [build-dependencies]
 vergen = { version = "8.1.1", features = ["build", "git", "gitcl"] }

filecoin-hashers/Cargo.toml

@@ -9,20 +9,20 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-bellperson = "0.26.0"
-blstrs = "0.7.0"
-generic-array = "0.14.4"
-merkletree = "0.23.0"
-ff = "0.13.0"
-anyhow = "1.0.34"
-serde = "1.0.117"
-rand = "0.8.0"
-
-neptune = { version = "11.0.0", optional = true, features = ["bls", "arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
-lazy_static = { version = "1.4.0", optional = true }
-blake2s_simd = { version = "1.0.0", optional = true }
-sha2 = { version = "0.10.2", optional = true }
-hex = "0.4.2"
+# Sorted alphabetically
+anyhow.workspace = true
+bellperson.workspace = true
+blake2s_simd = { workspace = true, optional = true }
+blstrs.workspace = true
+ff.workspace = true
+generic-array.workspace = true
+hex.workspace = true
+lazy_static = { workspace = true, optional = true }
+merkletree.workspace = true
+neptune = { workspace = true, optional = true }
+rand.workspace = true
+serde.workspace = true
+sha2 = { workspace = true, optional = true }
 
 [features]
 default = ["opencl", "blake2s", "poseidon", "sha256"]
@@ -36,5 +36,5 @@ poseidon = ["neptune", "lazy_static"]
 sha256 = ["sha2"]
 
 [dev-dependencies]
-rand_xorshift = "0.3.0"
-serde_json = "1.0.59"
+rand_xorshift.workspace = true
+serde_json.workspace = true

filecoin-proofs/Cargo.toml

@@ -9,39 +9,41 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-storage-proofs-core = { path = "../storage-proofs-core", version = "~18.1.0", default-features = false}
-storage-proofs-porep = { path = "../storage-proofs-porep", version = "~18.1.0", default-features = false }
-storage-proofs-post = { path = "../storage-proofs-post", version = "~18.1.0", default-features = false }
-storage-proofs-update = { path = "../storage-proofs-update", version = "~18.1.0", default-features = false }
-filecoin-hashers = { version = "~13.1.0", path = "../filecoin-hashers", default-features = false, features = ["poseidon", "sha256"] }
-rand = "0.8"
-lazy_static = "1.2"
-memmap2 = "0.5.6"
-serde = { version = "1.0", features = ["rc", "derive"] }
-serde_json = "1.0"
-blake2b_simd = "1.0.0"
-bellperson = "0.26.0"
-log = "0.4.7"
-rayon = "1.1.0"
-hex = "0.4.0"
-merkletree = "0.23.0"
-bincode = "1.1.2"
-anyhow = "1.0.23"
-sha2 = "0.10.2"
-typenum = "1.11.2"
-gperftools = { version = "0.2", optional = true }
-generic-array = "0.14.4"
-fr32 = { path = "../fr32", version = "~11.1.0", default-features = false }
-once_cell = "1.8.0"
-blstrs = "0.7.0"
-ff = { version = "0.13.0", default-features = false }
+filecoin-hashers = { workspace = true, features = ["poseidon", "sha256"] }
+fr32.workspace = true
+storage-proofs-core.workspace = true
+storage-proofs-porep.workspace = true
+storage-proofs-post.workspace = true
+storage-proofs-update.workspace = true
+# Sorted alphabetically
+anyhow.workspace = true
+bellperson.workspace = true
+bincode.workspace = true
+blake2b_simd.workspace = true
+blstrs.workspace = true
+ff.workspace = true
+generic-array.workspace = true
+gperftools = { workspace = true, optional = true }
+hex.workspace = true
 iowrap = "0.2.1"
+lazy_static.workspace = true
+log.workspace = true
+memmap2.workspace = true
+merkletree.workspace = true
+once_cell = "1.8.0"
+rand.workspace = true
+rayon.workspace = true
+serde = { workspace = true, features = ["rc", "derive"] }
+serde_json.workspace = true
+sha2.workspace = true
+typenum.workspace = true
 
 [dev-dependencies]
-criterion = "0.3"
-tempfile = "3"
-fil_logger = "0.1.6"
-rand_xorshift = "0.3.0"
+# Sorted alphabetically
+criterion.workspace = true
+fil_logger.workspace = true
+rand_xorshift.workspace = true
+tempfile.workspace = true
 walkdir = "2.3.2"
 
 [features]

fr32/Cargo.toml

@@ -8,20 +8,22 @@ edition = "2018"
 repository = "https://github.com/filecoin-project/rust-fil-proofs"
 
 [dependencies]
-anyhow = "1.0.23"
-byte-slice-cast = "1.0.0"
-byteorder = "1"
-ff = "0.13.0"
-thiserror = "1.0.6"
-blstrs = "0.7.0"
+# Sorted alphabetically
+anyhow.workspace = true
+blstrs.workspace = true
+byte-slice-cast.workspace = true
+byteorder.workspace = true
+ff.workspace = true
+thiserror.workspace = true
 
 [dev-dependencies]
+# Sorted alphabetically
 bitvec = "0.17"
-criterion = "0.3"
-itertools = "0.10.3"
-pretty_assertions = "1.2.0"
-rand = "0.8"
-rand_xorshift = "0.3"
+criterion.workspace = true
+itertools.workspace = true
+pretty_assertions.workspace = true
+rand.workspace = true
+rand_xorshift.workspace = true
 
 [[bench]]
 name = "fr"

sha2raw/Cargo.toml

@@ -11,22 +11,22 @@ categories = ["cryptography", "no-std"]
 edition = "2018"
 
 [dependencies]
+# Sorted alphabetically
+byteorder.workspace = true
 digest = "0.10.3"
 fake-simd = "0.1"
+lazy_static.workspace = true
 opaque-debug = "0.3"
 sha2-asm = { version = "0.6", optional = true }
-byteorder = "1.3.4"
-
-[dependencies.lazy_static]
-version = "1.4.0"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 cpufeatures = "0.2.2"
 
 [dev-dependencies]
-sha2 = "0.10.2"
-rand = "0.8.5"
-rand_xorshift = "0.3.0"
+# Sorted alphabetically
+rand.workspace = true
+rand_xorshift.workspace = true
+sha2.workspace = true
 
 [features]
 default = ["asm"]