diff --git a/Cargo.lock b/Cargo.lock index 790702175f..2569470b06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -741,13 +741,12 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colored" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1291,7 +1290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2053,14 +2052,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2989,7 +2988,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3069,7 +3068,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3094,6 +3093,17 @@ dependencies = [ "libfuzzer-sys", ] +[[package]] +name = "ipld_hamt-fuzz" +version = "0.0.0" +dependencies = [ + "ahash 0.7.7", + "arbitrary", + "fvm_ipld_blockstore 0.2.0", + "fvm_ipld_hamt 0.9.0", + "libfuzzer-sys", +] + [[package]] name = "ipld_kamt-fuzz" version = "0.0.0" @@ -3113,7 +3123,7 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", "rustix 0.38.19", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3820,7 +3830,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3929,7 +3939,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4279,7 +4289,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4292,7 +4302,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.10", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4793,7 +4803,7 @@ dependencies = [ "fastrand 2.0.1", "redox_syscall 0.3.5", "rustix 0.38.19", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5192,7 +5202,7 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5285,7 +5295,7 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5306,7 +5316,7 @@ checksum = "b59f94b0409221873565419168e20b5aedf18c4bd64de5c38acf8f0634efeee3" dependencies = [ "cfg-if", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5333,7 +5343,7 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5439,7 +5449,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -5448,13 +5467,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -5463,42 +5497,84 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index d7acd283ff..82ee0a58cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,13 @@ 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", @@ -17,7 +18,7 @@ members = [ [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" @@ -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" @@ -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" } @@ -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" diff --git a/ipld/hamt/fuzz/Cargo.toml b/ipld/hamt/fuzz/Cargo.toml index 4a3aaaa303..37e438532f 100644 --- a/ipld/hamt/fuzz/Cargo.toml +++ b/ipld/hamt/fuzz/Cargo.toml @@ -16,11 +16,6 @@ ahash = { workspace = true } fvm_ipld_hamt = { workspace = true } fvm_ipld_blockstore = { workspace = true } - -# Prevent this from interfering with workspaces -[workspace] -members = ["."] - [[bin]] name = "simple" path = "fuzz_targets/simple.rs" diff --git a/ipld/hamt/fuzz/fuzz_targets/simple.rs b/ipld/hamt/fuzz/fuzz_targets/simple.rs index 2d28e3fa40..fbcf8bf7bc 100644 --- a/ipld/hamt/fuzz/fuzz_targets/simple.rs +++ b/ipld/hamt/fuzz/fuzz_targets/simple.rs @@ -10,7 +10,9 @@ mod common; fuzz_target!(|data: (u8, Vec)| { 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); }); diff --git a/testing/common_fuzz/fuzz/Cargo.toml b/testing/common_fuzz/fuzz/Cargo.toml index 4d807902a8..b678cd4a3c 100644 --- a/testing/common_fuzz/fuzz/Cargo.toml +++ b/testing/common_fuzz/fuzz/Cargo.toml @@ -9,22 +9,22 @@ edition = "2021" cargo-fuzz = true [dependencies] -libfuzzer-sys = { workspace = true } -arbitrary = { workspace = true, features = ["derive"] } -rand = { workspace = true } +libfuzzer-sys = "0.4" +arbitrary = { version = "1.1", features = ["derive"] } +rand = "0.8.5" cid = { workspace = true, features = ["serde-codec", "arb", "std"] } -fvm_ipld_bitfield = { workspace = true, features = ["enable-arbitrary"] } -fvm_ipld_encoding = { workspace = true } -fvm_shared ={ workspace = true, features = ["arb"] } -serde = { workspace = true } +fvm_ipld_bitfield = { path = "../../../ipld/bitfield", features = ["enable-arbitrary"] } +fvm_ipld_encoding = { path = "../../../ipld/encoding" } +fvm_shared = { path = "../../../shared", features = ["arb"] } +serde = { version = "1", features = ["derive"] } # Prevent this from interfering with workspaces [workspace] members = ["."] [workspace.dependencies] -cid = { workspace = true } -multihash = { workspace = true } +cid = "0.10.1" +multihash = "0.18.1" [[bin]] name = "rle_ops"