Skip to content

Commit

Permalink
Merge pull request #189 from piotr-roslaniec/workspace-deps
Browse files Browse the repository at this point in the history
Move shared dependencies to the workspace crate
  • Loading branch information
piotr-roslaniec authored Apr 25, 2024
2 parents b72a338 + 983110c commit be98542
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 186 deletions.
114 changes: 6 additions & 108 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,47 @@ members = [
"subproductdomain",
]

[workspace.dependencies]
anyhow = "1.0.47"
ark-bls12-381 = "0.4.0"
ark-ec = "0.4"
ark-ff = "0.4"
ark-poly = "0.4"
ark-serialize = "0.4"
ark-std = "0.4"
bincode = "1.3.3"
chacha20poly1305 = "0.10.1"
criterion = "0.3"
console_error_panic_hook = "0.1.7"
derive_more = { version = "0.99", default-features = false }
digest = "0.10.0"
ferveo-common = { path = "ferveo-common" }
ferveo-tdec = { path = "ferveo-tdec" }
generic-array = "0.14.7"
getrandom = "0.2"
hex = "0.4"
itertools = "0.10.5"
js-sys = "0.3.63"
measure_time = "0.8"
miracl_core = "=2.3.0"
pprof = "0.6"
pyo3 = "0.18.2"
pyo3-build-config = "*"
rand = "0.8"
rand_core = "0.6.4"
rand_old = { package = "rand", version = "0.7" } # TODO: Used by benchmarks/pairing.rs, update to rand = "0.8" when possible
serde = "1.0"
serde_bytes = "0.11.9"
serde_with = "2.2.0"
sha2 = "0.10.6"
subproductdomain = { path = "subproductdomain" }
test-case = "3.3.1"
thiserror = "1.0"
wasm-bindgen = "0.2.86"
wasm-bindgen-derive = "0.2.1"
wasm-bindgen-test = "0.3.28"
zeroize = "1.6.0"

[profile.bench]
opt-level = 3
debug = true
Expand Down
18 changes: 9 additions & 9 deletions ferveo-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ authors = ["Heliax AG <hello@heliax.dev>", "Piotr Roslaniec <p.roslaniec@gmail.c
description = "Common types and traits for Ferveo"

[dependencies]
ark-ec = "0.4"
ark-serialize = { version = "0.4", features = ["derive"] }
ark-std = "0.4"
bincode = "1.3.3"
generic-array = "0.14.7"
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serde_with = "2.2.0"
ark-ec = { workspace = true }
ark-serialize = { workspace = true, features = ["derive"] }
ark-std = { workspace = true }
bincode = { workspace = true }
generic-array = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_with = { workspace = true }

[dev-dependencies]
ark-bls12-381 = "0.4.0"
ark-bls12-381 = { workspace = true }
4 changes: 2 additions & 2 deletions ferveo-python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ default = ["extension-module"]

[dependencies]
ferveo = { package = "ferveo-pre-release", path = "../ferveo", features = ["bindings-python"] }
pyo3 = "0.18.2"
pyo3 = { workspace = true }

[build-dependencies]
pyo3-build-config = "*"
pyo3-build-config = { workspace = true }
40 changes: 20 additions & 20 deletions ferveo-tdec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ test-common = []
api = []

[dependencies]
ark-bls12-381 = "0.4"
ark-ec = "0.4"
ark-ff = "0.4"
ark-poly = "0.4"
ark-serialize = "0.4"
ark-std = "0.4"
bincode = "1.3.3"
chacha20poly1305 = "0.10.1"
ark-bls12-381 = { workspace = true }
ark-ec = { workspace = true }
ark-ff = { workspace = true }
ark-poly = { workspace = true }
ark-serialize = { workspace = true }
ark-std = { workspace = true }
bincode = { workspace = true }
chacha20poly1305 = { workspace = true }
ferveo-common = { package = "ferveo-common-pre-release", path = "../ferveo-common", version = "^0.1.1" }
itertools = "0.10"
miracl_core = "=2.3.0"
rand = "0.8"
rand_core = "0.6"
serde = { version = "1.0", features = ["derive"] }
serde_bytes = "0.11.9"
serde_with = "2.0.1"
sha2 = "0.10.6"
itertools = { workspace = true }
miracl_core = { workspace = true }
rand = { workspace = true }
rand_core = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_bytes = { workspace = true }
serde_with = { workspace = true }
sha2 = { workspace = true }
subproductdomain = { package = "subproductdomain-pre-release", path = "../subproductdomain", version = "^0.1.0" }
thiserror = "1.0"
zeroize = "1.6.0"
thiserror = { workspace = true }
zeroize = { workspace = true }

[dev-dependencies]
criterion = { version = "0.4", features = ["html_reports"] }
hex = "=0.4.3"
criterion = { workspace = true, features = ["html_reports"] }
hex = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["serde_bytes"]
Expand Down
4 changes: 2 additions & 2 deletions ferveo-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ crate-type = ["cdylib", "rlib"]
ferveo = { package = "ferveo-pre-release", path = "../ferveo", features = ["bindings-wasm"] }

[dev-dependencies]
wasm-bindgen-test = "0.3.28"
itertools = "0.10.5"
wasm-bindgen-test = { workspace = true }
itertools = { workspace = true }

Loading

0 comments on commit be98542

Please sign in to comment.