Skip to content

Commit

Permalink
fix ci errors
Browse files Browse the repository at this point in the history
also needed to rename kamt/fuzz/simple and hamt/fuzz/simple targets
as they were colliding using a single workspace
  • Loading branch information
fridrik01 committed Dec 18, 2023
1 parent 6a5dc2d commit 473d61c
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 54 deletions.
134 changes: 105 additions & 29 deletions Cargo.lock

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

15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ members = [
"fvm",
"sdk",
"shared",
"testing/conformance",
"testing/integration",
"testing/calibration/shared",
"ipld/*",
"ipld/amt/fuzz",
"ipld/hamt/fuzz",
"ipld/kamt/fuzz",
"testing/calibration/shared",
"testing/conformance",
"testing/integration",
"testing/test_actors",
"testing/test_actors/actors/*",
"tools/fvm-bench",
]

[workspace.dependencies]
# common
serde = { version = "1.0.164", features = ["derive"] }
serde = { version = "1.0.164", default-features = false, features = ["derive"] }
thiserror = "1.0.40"
anyhow = "1.0.71"
rand = "0.8.5"
Expand All @@ -26,7 +27,7 @@ serde_json = "1.0.99"
serde_tuple = "0.5.0"
byteorder = "1.4.3"
hex = "0.4.3"
num-traits = "0.2.14"
num-traits = { version = "0.2.14", default-features = false }
num-derive = "0.4.0"
lazy_static = "1.4.0"
log = "0.4.19"
Expand Down Expand Up @@ -58,7 +59,8 @@ quickcheck_macros = "1.0.0"
minstant = "0.1.3"

# workspace
fvm = { path = "fvm" }
fvm = { path = "fvm", default-features = false }
fvm_shared = { path = "shared", default-features = false }
fvm_sdk = { path = "sdk" }
fvm_ipld_amt = { path = "ipld/amt" }
fvm_ipld_hamt = { path = "ipld/hamt" }
Expand All @@ -67,7 +69,6 @@ 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
7 changes: 1 addition & 6 deletions ipld/hamt/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ ahash = { workspace = true }
fvm_ipld_hamt = { workspace = true }
fvm_ipld_blockstore = { workspace = true }


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

[[bin]]
name = "simple"
name = "hamt-simple"
path = "fuzz_targets/simple.rs"
test = false
doc = false
Expand Down
6 changes: 4 additions & 2 deletions ipld/hamt/fuzz/fuzz_targets/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ mod common;

fuzz_target!(|data: (u8, Vec<common::Operation>)| {
let (flush_rate, operations) = data;
let mut conf = Config::default();
conf.bit_width = 5;
let conf = Config {
bit_width: 5,
..Default::default()
};
common::run(flush_rate, operations, conf);
});
2 changes: 1 addition & 1 deletion ipld/kamt/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fvm_ipld_kamt = { workspace = true }
fvm_ipld_blockstore = { workspace = true }

[[bin]]
name = "simple"
name = "kamt-simple"
path = "fuzz_targets/simple.rs"
test = false
doc = false
Loading

0 comments on commit 473d61c

Please sign in to comment.