Skip to content

Commit

Permalink
Use workspace dependencies in subcrates
Browse files Browse the repository at this point in the history
  • Loading branch information
fridrik01 committed Dec 15, 2023
1 parent a8f9be1 commit 3c4b9e9
Show file tree
Hide file tree
Showing 37 changed files with 370 additions and 252 deletions.
76 changes: 76 additions & 0 deletions Cargo.lock

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

49 changes: 49 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,57 @@ members = [
]

[workspace.dependencies]
# common
serde = { version = "1.0.164", features = ["derive"] }
thiserror = "1.0.40"
anyhow = "1.0.71"
rand = "0.8.5"
rand_chacha = "0.3.0"
serde_json = "1.0.99"
serde_tuple = "0.5.0"
byteorder = "1.4.3"
hex = "0.4.3"
num-traits = "0.2.14"
num-derive = "0.4.0"
lazy_static = "1.4.0"
log = "0.4.19"
futures = "0.3.28"

# IPLD/Encoding
cid = { version = "0.10.1", default-features = false }
multihash = { version = "0.18.1", default-features = false }
libipld = { version = "0.16.0", features = ["serde-codec"] }
libipld-core = { version = "0.16.0", features = ["serde-codec"] }

# crypto
blake2b_simd = "1.0.1"
libsecp256k1 = { version = "0.7.1" }
bls-signatures = { version = "0.15", default-features = false }

# misc
libfuzzer-sys = "0.4"
arbitrary = "1.3.0"
ahash = "0.7.6"
itertools = "0.11.0"
once_cell = "1.18.0"
unsigned-varint = "0.7.2"

# dev/tools/tests
criterion = "0.5.1"
quickcheck = "1.0.0"
quickcheck_macros = "1.0.0"
minstant = "0.1.3"

# workspace
fvm = { path = "fvm" }
fvm_sdk = { path = "sdk" }
fvm_ipld_amt = { path = "ipld/amt" }
fvm_ipld_hamt = { path = "ipld/hamt" }
fvm_ipld_car = { path = "ipld/car" }
fvm_ipld_blockstore = { path = "ipld/blockstore" }
fvm_ipld_bitfield = { path = "ipld/bitfield" }
fvm_ipld_encoding = { path = "ipld/encoding" }
fvm_shared = { path = "shared" }

[profile.actor]
inherits = "release"
Expand Down
40 changes: 20 additions & 20 deletions fvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,40 @@ keywords = ["filecoin", "web3", "wasm"]
crate-type = ["lib"]

[dependencies]
anyhow = { version = "1.0.71", features = ["backtrace"] }
thiserror = "1.0.40"
num-traits = "0.2"
anyhow = { workspace = true, features = ["backtrace"] }
thiserror = { workspace = true }
num-traits = { workspace = true }
cid = { workspace = true, features = ["serde-codec"] }
multihash = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
fvm_shared = { version = "4.0.0", path = "../shared", features = ["crypto"] }
fvm_ipld_hamt = { version = "0.9.0", path = "../ipld/hamt" }
fvm_ipld_amt = { version = "0.6.2", path = "../ipld/amt" }
fvm_ipld_blockstore = { version = "0.2.0", path = "../ipld/blockstore" }
fvm_ipld_encoding = { version = "0.4.0", path = "../ipld/encoding" }
serde = { version = "1.0", features = ["derive"] }
serde_tuple = "0.5"
lazy_static = "1.4.0"
fvm_shared = { workspace = true, features = ["crypto"] }
fvm_ipld_hamt = { workspace = true }
fvm_ipld_amt = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
serde = { workspace = true }
serde_tuple = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
arbitrary = { workspace = true, optional = true, features = ["derive"] }
rand = { workspace = true }
quickcheck = { workspace = true, optional = true }
once_cell = { workspace = true }
minstant = { workspace = true }
blake2b_simd = { workspace = true }
byteorder = { workspace = true }
derive_more = "0.99.17"
replace_with = "0.1.7"
filecoin-proofs-api = { version = "16", default-features = false }
rayon = "1"
num_cpus = "1.15.0"
log = "0.4.19"
fvm-wasm-instrument = "0.4.0"
yastl = "0.1.2"
arbitrary = { version = "1.3.0", optional = true, features = ["derive"] }
rand = "0.8.5"
quickcheck = { version = "1", optional = true }
once_cell = "1.18"
minstant = "0.1.2"
blake2b_simd = "1.0.0"
byteorder = "1.4.3"
static_assertions = "1.1.0"
ambassador = "0.3.5"

[dev-dependencies]
pretty_assertions = "1.3.0"
fvm = { path = ".", features = ["testing"], default-features = false }
fvm = { workspace = true, features = ["testing"], default-features = false }

[dependencies.wasmtime]
version = "12.0.2"
Expand Down
20 changes: 10 additions & 10 deletions ipld/amt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
cid = { workspace = true, features = ["serde-codec"] }
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
once_cell = "1.18"
itertools = "0.11"
anyhow = "1.0.71"
fvm_ipld_blockstore = { version = "0.2", path = "../blockstore" }
fvm_ipld_encoding = { version = "0.4", path = "../encoding" }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
once_cell = { workspace = true }
itertools = { workspace = true }
anyhow = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }

[dev-dependencies]
criterion = "0.5.1"
quickcheck = "1"
quickcheck_macros = "1"
criterion = { workspace = true }
quickcheck = { workspace = true }
quickcheck_macros = { workspace = true }

[[bench]]
name = "amt_benchmark"
Expand Down
14 changes: 7 additions & 7 deletions ipld/amt/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ edition = "2021"
cargo-fuzz = true

[dependencies]
libfuzzer-sys = "0.4"
arbitrary = { version = "1.1", features = ["derive"] }
ahash = "0.7.6"
itertools = "0.10.3"
libfuzzer-sys = { workspace = true }
arbitrary = { workspace = true, features = ["derive"] }
ahash = { workspace = true }
itertools = { workspace = true }

cid = { workspace = true, features = ["serde-codec", "arb", "std"] }
fvm_ipld_amt = { path = ".."}
fvm_ipld_blockstore = { path = "../../blockstore" }
fvm_ipld_amt = { workspace = true }
fvm_ipld_blockstore = { workspace = true }

# Prevent this from interfering with workspaces
[workspace]
members = ["."]

[workspace.dependencies]
cid = "0.10.1"
cid = { workspace = true }

[[bin]]
name = "equivalence"
Expand Down
16 changes: 8 additions & 8 deletions ipld/bitfield/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ edition = "2021"
repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
unsigned-varint = "0.7.1"
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0.40"
arbitrary = { version = "1.3.0", optional = true}
fvm_ipld_encoding = { version = "0.4", path = "../encoding" }
unsigned-varint = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
arbitrary = { workspace = true, optional = true}
fvm_ipld_encoding = { workspace = true }

[dev-dependencies]
rand = { workspace = true }
criterion = { workspace = true }
serde_json = { workspace = true }
rand_xorshift = "0.3.0"
rand = "0.8.5"
criterion = "0.5"
serde_json = "1.0"
gperftools = "0.2.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion ipld/blockstore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
cid = { workspace = true, features = ["serde-codec", "std"] }
anyhow = "1.0.71"
anyhow = { workspace = true }
# multihash is also re-exported by `cid`. Having `multihash` here as a
# depdendency is needed to enable the features of the re-export.
multihash = { workspace = true, features = ["multihash-impl"] }
Expand Down
12 changes: 6 additions & 6 deletions ipld/car/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
cid = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
futures = "0.3.28"
fvm_ipld_blockstore = { version = "0.2", path = "../blockstore" }
fvm_ipld_encoding = { version = "0.4", path = "../encoding" }
unsigned-varint = { version = "0.7.2", features = ["futures"] }
serde = { workspace = true }
thiserror = { workspace = true }
unsigned-varint = { workspace = true, features = ["futures"] }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
futures = { workspace = true }

[dev-dependencies]
async-std = { version = "1.12", features = ["attributes"] }
16 changes: 8 additions & 8 deletions ipld/encoding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ edition = "2021"
repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde_ipld_dagcbor = "0.4.0"
serde_tuple = "0.5"
serde_repr = "0.1"
serde = { workspace = true }
serde_tuple = { workspace = true }
cid = { workspace = true, features = ["serde-codec", "std"] }
thiserror = "1.0"
anyhow = "1.0.71"
fvm_ipld_blockstore = { version = "0.2", path = "../blockstore" }
thiserror = { workspace = true }
anyhow = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
# multihash is also re-exported by `cid`. Having `multihash` here as a
# depdendency is needed to enable the features of the re-export.
multihash = { workspace = true, features = ["blake2b", "multihash-impl"] }
serde_ipld_dagcbor = "0.4.0"
serde_repr = "0.1"

[features]
default = []

[dev-dependencies]
serde_json = "1.0.99"
serde_json = { workspace = true }
Loading

0 comments on commit 3c4b9e9

Please sign in to comment.