From fc6587649e0753e5f7255980968d8924f13daeb3 Mon Sep 17 00:00:00 2001 From: Sam Gwilym Date: Tue, 6 Aug 2024 15:48:07 +0100 Subject: [PATCH] Rename fuzzing crate --- Cargo.lock | 2 +- fuzz/Cargo.toml | 2 +- fuzz/fuzz_targets/area_rel_area_encoding.rs | 2 +- fuzz/fuzz_targets/area_rel_area_encoding_random.rs | 2 +- fuzz/fuzz_targets/entry_encoding.rs | 4 ++-- fuzz/fuzz_targets/entry_encoding_random.rs | 2 +- fuzz/fuzz_targets/entry_rel_entry_encoding.rs | 4 ++-- fuzz/fuzz_targets/entry_rel_entry_encoding_random.rs | 4 ++-- fuzz/fuzz_targets/entry_rel_namespace_area_encoding.rs | 4 ++-- fuzz/fuzz_targets/entry_rel_namespace_area_encoding_random.rs | 4 ++-- fuzz/fuzz_targets/entry_rel_namespace_range_encoding.rs | 4 ++-- .../fuzz_targets/entry_rel_namespace_range_encoding_random.rs | 4 ++-- fuzz/fuzz_targets/mc_capability_append_delegation.rs | 2 +- fuzz/fuzz_targets/mc_capability_delegation.rs | 2 +- fuzz/fuzz_targets/mc_capability_rel_area_encoding.rs | 4 ++-- fuzz/fuzz_targets/mc_capability_rel_area_encoding_random.rs | 4 ++-- fuzz/fuzz_targets/mc_is_authorised_write.rs | 2 +- fuzz/fuzz_targets/mc_subspace_capability_append_delegation.rs | 2 +- fuzz/fuzz_targets/mc_subspace_capability_delegation.rs | 2 +- fuzz/fuzz_targets/mc_subspace_capability_encoding.rs | 4 ++-- fuzz/fuzz_targets/mc_subspace_capability_encoding_random.rs | 4 ++-- fuzz/fuzz_targets/path.rs | 2 +- fuzz/fuzz_targets/path2.rs | 2 +- fuzz/fuzz_targets/path3.rs | 2 +- fuzz/fuzz_targets/path4.rs | 2 +- fuzz/fuzz_targets/path_encoding.rs | 2 +- fuzz/fuzz_targets/path_encoding2.rs | 2 +- fuzz/fuzz_targets/path_encoding3.rs | 2 +- fuzz/fuzz_targets/path_encoding_random.rs | 2 +- fuzz/fuzz_targets/path_encoding_random2.rs | 2 +- fuzz/fuzz_targets/path_encoding_random3.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding2.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding3.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding_random.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding_random2.rs | 2 +- fuzz/fuzz_targets/path_rel_path_encoding_random3.rs | 2 +- fuzz/fuzz_targets/path_successor.rs | 2 +- fuzz/fuzz_targets/path_successor_even_more.rs | 2 +- fuzz/fuzz_targets/path_successor_more.rs | 2 +- fuzz/fuzz_targets/range3d_rel_rang3d_encoding_random.rs | 2 +- fuzz/fuzz_targets/range3d_rel_range3d_encoding.rs | 2 +- fuzz/fuzz_targets/successor_of_prefix.rs | 2 +- fuzz/fuzz_targets/successor_of_prefix_even_more.rs | 2 +- fuzz/fuzz_targets/successor_of_prefix_more.rs | 2 +- fuzz/fuzz_targets/u16be_encoding.rs | 2 +- fuzz/fuzz_targets/u16be_encoding_random.rs | 2 +- fuzz/fuzz_targets/u32be_encoding.rs | 2 +- fuzz/fuzz_targets/u32be_encoding_random.rs | 2 +- fuzz/fuzz_targets/u64be_encoding.rs | 2 +- fuzz/fuzz_targets/u64be_encoding_random.rs | 2 +- fuzz/fuzz_targets/u8be_encoding.rs | 2 +- fuzz/fuzz_targets/u8be_encoding_random.rs | 2 +- 53 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 780f07f..e945dc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,7 +570,7 @@ dependencies = [ ] [[package]] -name = "willow-data-model-fuzz" +name = "willow-fuzz" version = "0.0.0" dependencies = [ "arbitrary", diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index e7f7222..7e9ab60 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "willow-data-model-fuzz" +name = "willow-fuzz" version = "0.0.0" publish = false edition = "2021" diff --git a/fuzz/fuzz_targets/area_rel_area_encoding.rs b/fuzz/fuzz_targets/area_rel_area_encoding.rs index f6c7baa..8dd1b22 100644 --- a/fuzz/fuzz_targets/area_rel_area_encoding.rs +++ b/fuzz/fuzz_targets/area_rel_area_encoding.rs @@ -4,7 +4,7 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId; use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::grouping::Area; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::encode::relative_encoding_roundtrip; fuzz_target!(|data: ( Area<16, 16, 16, IdentityId>, diff --git a/fuzz/fuzz_targets/area_rel_area_encoding_random.rs b/fuzz/fuzz_targets/area_rel_area_encoding_random.rs index 79740bc..b80a0a1 100644 --- a/fuzz/fuzz_targets/area_rel_area_encoding_random.rs +++ b/fuzz/fuzz_targets/area_rel_area_encoding_random.rs @@ -3,7 +3,7 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId; use libfuzzer_sys::fuzz_target; use willow_data_model::grouping::Area; -use willow_data_model_fuzz::encode::relative_encoding_random_less_strict; +use willow_fuzz::encode::relative_encoding_random_less_strict; fuzz_target!(|data: (&[u8], Area<16, 16, 16, IdentityId>)| { // fuzzed code goes here diff --git a/fuzz/fuzz_targets/entry_encoding.rs b/fuzz/fuzz_targets/entry_encoding.rs index 3bc82f7..e08bfda 100644 --- a/fuzz/fuzz_targets/entry_encoding.rs +++ b/fuzz/fuzz_targets/entry_encoding.rs @@ -5,8 +5,8 @@ use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::encoding_roundtrip; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::encoding_roundtrip; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!(|data: ( Entry<3, 3, 3, EsNamespaceId, IdentityId, FakePayloadDigest>, diff --git a/fuzz/fuzz_targets/entry_encoding_random.rs b/fuzz/fuzz_targets/entry_encoding_random.rs index fd8036b..01fcd9b 100644 --- a/fuzz/fuzz_targets/entry_encoding_random.rs +++ b/fuzz/fuzz_targets/entry_encoding_random.rs @@ -6,7 +6,7 @@ use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use willow_data_model::Entry; use libfuzzer_sys::fuzz_target; -use willow_data_model_fuzz::{encode::encoding_random, placeholder_params::FakePayloadDigest}; +use willow_fuzz::{encode::encoding_random, placeholder_params::FakePayloadDigest}; fuzz_target!(|data: &[u8]| { smol::block_on(async { diff --git a/fuzz/fuzz_targets/entry_rel_entry_encoding.rs b/fuzz/fuzz_targets/entry_rel_entry_encoding.rs index 12b9f6b..1a084cd 100644 --- a/fuzz/fuzz_targets/entry_rel_entry_encoding.rs +++ b/fuzz/fuzz_targets/entry_rel_entry_encoding.rs @@ -5,8 +5,8 @@ use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!(|data: ( Entry<16, 16, 16, EsNamespaceId, IdentityId, FakePayloadDigest>, diff --git a/fuzz/fuzz_targets/entry_rel_entry_encoding_random.rs b/fuzz/fuzz_targets/entry_rel_entry_encoding_random.rs index 24fc419..9e2cc21 100644 --- a/fuzz/fuzz_targets/entry_rel_entry_encoding_random.rs +++ b/fuzz/fuzz_targets/entry_rel_entry_encoding_random.rs @@ -4,8 +4,8 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId; use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use libfuzzer_sys::fuzz_target; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_random_less_strict; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_random_less_strict; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!(|data: ( &[u8], diff --git a/fuzz/fuzz_targets/entry_rel_namespace_area_encoding.rs b/fuzz/fuzz_targets/entry_rel_namespace_area_encoding.rs index be345f8..d2def9b 100644 --- a/fuzz/fuzz_targets/entry_rel_namespace_area_encoding.rs +++ b/fuzz/fuzz_targets/entry_rel_namespace_area_encoding.rs @@ -6,8 +6,8 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::grouping::Area; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!(|data: ( Entry<16, 16, 16, EsNamespaceId, IdentityId, FakePayloadDigest>, diff --git a/fuzz/fuzz_targets/entry_rel_namespace_area_encoding_random.rs b/fuzz/fuzz_targets/entry_rel_namespace_area_encoding_random.rs index c3ca758..7158f88 100644 --- a/fuzz/fuzz_targets/entry_rel_namespace_area_encoding_random.rs +++ b/fuzz/fuzz_targets/entry_rel_namespace_area_encoding_random.rs @@ -5,8 +5,8 @@ use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use libfuzzer_sys::fuzz_target; use willow_data_model::grouping::Area; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_random_less_strict; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_random_less_strict; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!( |data: (&[u8], (EsNamespaceId, Area<16, 16, 16, IdentityId>))| { diff --git a/fuzz/fuzz_targets/entry_rel_namespace_range_encoding.rs b/fuzz/fuzz_targets/entry_rel_namespace_range_encoding.rs index 6ea106c..b478c7f 100644 --- a/fuzz/fuzz_targets/entry_rel_namespace_range_encoding.rs +++ b/fuzz/fuzz_targets/entry_rel_namespace_range_encoding.rs @@ -6,8 +6,8 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::grouping::Range3d; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!(|data: ( Entry<16, 16, 16, EsNamespaceId, IdentityId, FakePayloadDigest>, diff --git a/fuzz/fuzz_targets/entry_rel_namespace_range_encoding_random.rs b/fuzz/fuzz_targets/entry_rel_namespace_range_encoding_random.rs index a4dd427..45e1626 100644 --- a/fuzz/fuzz_targets/entry_rel_namespace_range_encoding_random.rs +++ b/fuzz/fuzz_targets/entry_rel_namespace_range_encoding_random.rs @@ -5,8 +5,8 @@ use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId; use libfuzzer_sys::fuzz_target; use willow_data_model::grouping::Range3d; use willow_data_model::Entry; -use willow_data_model_fuzz::encode::relative_encoding_random_less_strict; -use willow_data_model_fuzz::placeholder_params::FakePayloadDigest; +use willow_fuzz::encode::relative_encoding_random_less_strict; +use willow_fuzz::placeholder_params::FakePayloadDigest; fuzz_target!( |data: (&[u8], (EsNamespaceId, Range3d<16, 16, 16, IdentityId>))| { diff --git a/fuzz/fuzz_targets/mc_capability_append_delegation.rs b/fuzz/fuzz_targets/mc_capability_append_delegation.rs index ecb422a..3be9a1b 100644 --- a/fuzz/fuzz_targets/mc_capability_append_delegation.rs +++ b/fuzz/fuzz_targets/mc_capability_append_delegation.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use meadowcap::{Delegation, InvalidDelegationError, McCapability}; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: ( Delegation<16, 16, 16, SillyPublicKey, SillySig>, diff --git a/fuzz/fuzz_targets/mc_capability_delegation.rs b/fuzz/fuzz_targets/mc_capability_delegation.rs index a5aa67d..57e274f 100644 --- a/fuzz/fuzz_targets/mc_capability_delegation.rs +++ b/fuzz/fuzz_targets/mc_capability_delegation.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use meadowcap::{FailedDelegationError, McCapability}; use willow_data_model::grouping::Area; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig}; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig}; fuzz_target!(|data: ( SillySecret, diff --git a/fuzz/fuzz_targets/mc_capability_rel_area_encoding.rs b/fuzz/fuzz_targets/mc_capability_rel_area_encoding.rs index 851dd57..63fe3f2 100644 --- a/fuzz/fuzz_targets/mc_capability_rel_area_encoding.rs +++ b/fuzz/fuzz_targets/mc_capability_rel_area_encoding.rs @@ -4,8 +4,8 @@ use libfuzzer_sys::fuzz_target; use meadowcap::McCapability; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::grouping::Area; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: ( McCapability<3, 3, 3, SillyPublicKey, SillySig, SillyPublicKey, SillySig>, diff --git a/fuzz/fuzz_targets/mc_capability_rel_area_encoding_random.rs b/fuzz/fuzz_targets/mc_capability_rel_area_encoding_random.rs index 8867882..6c4de9c 100644 --- a/fuzz/fuzz_targets/mc_capability_rel_area_encoding_random.rs +++ b/fuzz/fuzz_targets/mc_capability_rel_area_encoding_random.rs @@ -3,8 +3,8 @@ use libfuzzer_sys::fuzz_target; use meadowcap::McCapability; use willow_data_model::grouping::Area; -use willow_data_model_fuzz::encode::relative_encoding_random; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::encode::relative_encoding_random; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: (&[u8], Area<3, 3, 3, SillyPublicKey>,)| { let (random_bytes, out) = data; diff --git a/fuzz/fuzz_targets/mc_is_authorised_write.rs b/fuzz/fuzz_targets/mc_is_authorised_write.rs index 88d0def..cd74624 100644 --- a/fuzz/fuzz_targets/mc_is_authorised_write.rs +++ b/fuzz/fuzz_targets/mc_is_authorised_write.rs @@ -7,7 +7,7 @@ use ufotofu::sync::consumer::IntoVec; use willow_data_model::encoding::sync::Encodable; use willow_data_model::Entry; use willow_data_model::IsAuthorisedWrite; -use willow_data_model_fuzz::{ +use willow_fuzz::{ placeholder_params::FakePayloadDigest, silly_sigs::{SillyPublicKey, SillySig}, }; diff --git a/fuzz/fuzz_targets/mc_subspace_capability_append_delegation.rs b/fuzz/fuzz_targets/mc_subspace_capability_append_delegation.rs index cf50346..390b9c5 100644 --- a/fuzz/fuzz_targets/mc_subspace_capability_append_delegation.rs +++ b/fuzz/fuzz_targets/mc_subspace_capability_append_delegation.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use meadowcap::{McSubspaceCapability, SubspaceDelegation}; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: ( SubspaceDelegation, diff --git a/fuzz/fuzz_targets/mc_subspace_capability_delegation.rs b/fuzz/fuzz_targets/mc_subspace_capability_delegation.rs index 5f98246..c62db68 100644 --- a/fuzz/fuzz_targets/mc_subspace_capability_delegation.rs +++ b/fuzz/fuzz_targets/mc_subspace_capability_delegation.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use meadowcap::McSubspaceCapability; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig}; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig}; fuzz_target!(|data: ( SillySecret, diff --git a/fuzz/fuzz_targets/mc_subspace_capability_encoding.rs b/fuzz/fuzz_targets/mc_subspace_capability_encoding.rs index 543844d..4db3f7d 100644 --- a/fuzz/fuzz_targets/mc_subspace_capability_encoding.rs +++ b/fuzz/fuzz_targets/mc_subspace_capability_encoding.rs @@ -3,8 +3,8 @@ use libfuzzer_sys::fuzz_target; use meadowcap::McSubspaceCapability; use ufotofu::local_nb::consumer::TestConsumer; -use willow_data_model_fuzz::encode::encoding_roundtrip; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::encode::encoding_roundtrip; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: ( McSubspaceCapability, diff --git a/fuzz/fuzz_targets/mc_subspace_capability_encoding_random.rs b/fuzz/fuzz_targets/mc_subspace_capability_encoding_random.rs index 517824d..e4d2fc9 100644 --- a/fuzz/fuzz_targets/mc_subspace_capability_encoding_random.rs +++ b/fuzz/fuzz_targets/mc_subspace_capability_encoding_random.rs @@ -2,8 +2,8 @@ use libfuzzer_sys::fuzz_target; use meadowcap::McSubspaceCapability; -use willow_data_model_fuzz::encode::encoding_random; -use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig}; +use willow_fuzz::encode::encoding_random; +use willow_fuzz::silly_sigs::{SillyPublicKey, SillySig}; fuzz_target!(|data: &[u8]| { smol::block_on(async { diff --git a/fuzz/fuzz_targets/path.rs b/fuzz/fuzz_targets/path.rs index 0fc1ca9..e66c012 100644 --- a/fuzz/fuzz_targets/path.rs +++ b/fuzz/fuzz_targets/path.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; fuzz_target!(|data: (CreatePath, CreatePath)| { let (cp1, cp2) = data; diff --git a/fuzz/fuzz_targets/path2.rs b/fuzz/fuzz_targets/path2.rs index 80cb63a..aade2dc 100644 --- a/fuzz/fuzz_targets/path2.rs +++ b/fuzz/fuzz_targets/path2.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; fuzz_target!(|data: (CreatePath, CreatePath)| { let (cp1, cp2) = data; diff --git a/fuzz/fuzz_targets/path3.rs b/fuzz/fuzz_targets/path3.rs index d5455f9..3c03aa1 100644 --- a/fuzz/fuzz_targets/path3.rs +++ b/fuzz/fuzz_targets/path3.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; fuzz_target!(|data: (CreatePath, CreatePath)| { let (cp1, cp2) = data; diff --git a/fuzz/fuzz_targets/path4.rs b/fuzz/fuzz_targets/path4.rs index fe4ab85..9e8ceaa 100644 --- a/fuzz/fuzz_targets/path4.rs +++ b/fuzz/fuzz_targets/path4.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; fuzz_target!(|data: (CreatePath, CreatePath)| { let (cp1, cp2) = data; diff --git a/fuzz/fuzz_targets/path_encoding.rs b/fuzz/fuzz_targets/path_encoding.rs index 6eae3d5..5a5a00c 100644 --- a/fuzz/fuzz_targets/path_encoding.rs +++ b/fuzz/fuzz_targets/path_encoding.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; const MCL: usize = 300; const MCC: usize = 300; diff --git a/fuzz/fuzz_targets/path_encoding2.rs b/fuzz/fuzz_targets/path_encoding2.rs index a4e4090..f81014b 100644 --- a/fuzz/fuzz_targets/path_encoding2.rs +++ b/fuzz/fuzz_targets/path_encoding2.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; const MCL: usize = 2; const MCC: usize = 3; diff --git a/fuzz/fuzz_targets/path_encoding3.rs b/fuzz/fuzz_targets/path_encoding3.rs index f5b988f..41dfa9f 100644 --- a/fuzz/fuzz_targets/path_encoding3.rs +++ b/fuzz/fuzz_targets/path_encoding3.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; const MCL: usize = 4; const MCC: usize = 4; diff --git a/fuzz/fuzz_targets/path_encoding_random.rs b/fuzz/fuzz_targets/path_encoding_random.rs index 85febf8..57359e7 100644 --- a/fuzz/fuzz_targets/path_encoding_random.rs +++ b/fuzz/fuzz_targets/path_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; const MCL: usize = 300; const MCC: usize = 300; diff --git a/fuzz/fuzz_targets/path_encoding_random2.rs b/fuzz/fuzz_targets/path_encoding_random2.rs index c6b38e0..19e6700 100644 --- a/fuzz/fuzz_targets/path_encoding_random2.rs +++ b/fuzz/fuzz_targets/path_encoding_random2.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; const MCL: usize = 2; const MCC: usize = 3; diff --git a/fuzz/fuzz_targets/path_encoding_random3.rs b/fuzz/fuzz_targets/path_encoding_random3.rs index a4421d3..0f441f9 100644 --- a/fuzz/fuzz_targets/path_encoding_random3.rs +++ b/fuzz/fuzz_targets/path_encoding_random3.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; const MCL: usize = 4; const MCC: usize = 4; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding.rs b/fuzz/fuzz_targets/path_rel_path_encoding.rs index 127f1a5..a371b0f 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding.rs @@ -4,7 +4,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::encode::relative_encoding_roundtrip; const MCL: usize = 300; const MCC: usize = 300; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding2.rs b/fuzz/fuzz_targets/path_rel_path_encoding2.rs index 1be606e..d6cdae0 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding2.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding2.rs @@ -4,7 +4,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::encode::relative_encoding_roundtrip; const MCL: usize = 2; const MCC: usize = 3; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding3.rs b/fuzz/fuzz_targets/path_rel_path_encoding3.rs index 9e979e3..0a31ce5 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding3.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding3.rs @@ -4,7 +4,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::encode::relative_encoding_roundtrip; const MCL: usize = 4; const MCC: usize = 4; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding_random.rs b/fuzz/fuzz_targets/path_rel_path_encoding_random.rs index f369a55..dacb0c1 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding_random.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_random; +use willow_fuzz::encode::relative_encoding_random; const MCL: usize = 300; const MCC: usize = 300; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding_random2.rs b/fuzz/fuzz_targets/path_rel_path_encoding_random2.rs index 02a0365..92cc517 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding_random2.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding_random2.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_random; +use willow_fuzz::encode::relative_encoding_random; const MCL: usize = 2; const MCC: usize = 3; diff --git a/fuzz/fuzz_targets/path_rel_path_encoding_random3.rs b/fuzz/fuzz_targets/path_rel_path_encoding_random3.rs index c1f82bf..746bb4c 100644 --- a/fuzz/fuzz_targets/path_rel_path_encoding_random3.rs +++ b/fuzz/fuzz_targets/path_rel_path_encoding_random3.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::Path; -use willow_data_model_fuzz::encode::relative_encoding_random; +use willow_fuzz::encode::relative_encoding_random; const MCL: usize = 4; const MCC: usize = 4; diff --git a/fuzz/fuzz_targets/path_successor.rs b/fuzz/fuzz_targets/path_successor.rs index 0b1758c..974a89d 100644 --- a/fuzz/fuzz_targets/path_successor.rs +++ b/fuzz/fuzz_targets/path_successor.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<2, 3, 3>, PathRc<2, 3, 3>)| { diff --git a/fuzz/fuzz_targets/path_successor_even_more.rs b/fuzz/fuzz_targets/path_successor_even_more.rs index 40bdaa5..c7b583f 100644 --- a/fuzz/fuzz_targets/path_successor_even_more.rs +++ b/fuzz/fuzz_targets/path_successor_even_more.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<4, 4, 16>, PathRc<4, 4, 16>)| { diff --git a/fuzz/fuzz_targets/path_successor_more.rs b/fuzz/fuzz_targets/path_successor_more.rs index 96d97a2..cc9c56e 100644 --- a/fuzz/fuzz_targets/path_successor_more.rs +++ b/fuzz/fuzz_targets/path_successor_more.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<3, 3, 3>, PathRc<3, 3, 3>)| { diff --git a/fuzz/fuzz_targets/range3d_rel_rang3d_encoding_random.rs b/fuzz/fuzz_targets/range3d_rel_rang3d_encoding_random.rs index ff44f72..f2f47e2 100644 --- a/fuzz/fuzz_targets/range3d_rel_rang3d_encoding_random.rs +++ b/fuzz/fuzz_targets/range3d_rel_rang3d_encoding_random.rs @@ -3,7 +3,7 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId; use libfuzzer_sys::fuzz_target; use willow_data_model::grouping::Range3d; -use willow_data_model_fuzz::encode::relative_encoding_random_less_strict; +use willow_fuzz::encode::relative_encoding_random_less_strict; fuzz_target!(|data: (&[u8], Range3d<16, 16, 16, IdentityId>)| { // fuzzed code goes here diff --git a/fuzz/fuzz_targets/range3d_rel_range3d_encoding.rs b/fuzz/fuzz_targets/range3d_rel_range3d_encoding.rs index 505049c..ecc3a75 100644 --- a/fuzz/fuzz_targets/range3d_rel_range3d_encoding.rs +++ b/fuzz/fuzz_targets/range3d_rel_range3d_encoding.rs @@ -4,7 +4,7 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId; use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::grouping::Range3d; -use willow_data_model_fuzz::encode::relative_encoding_roundtrip; +use willow_fuzz::encode::relative_encoding_roundtrip; fuzz_target!(|data: ( Range3d<16, 16, 16, IdentityId>, diff --git a/fuzz/fuzz_targets/successor_of_prefix.rs b/fuzz/fuzz_targets/successor_of_prefix.rs index 12a56ac..128f3f0 100644 --- a/fuzz/fuzz_targets/successor_of_prefix.rs +++ b/fuzz/fuzz_targets/successor_of_prefix.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<2, 3, 3>, PathRc<2, 3, 3>)| { diff --git a/fuzz/fuzz_targets/successor_of_prefix_even_more.rs b/fuzz/fuzz_targets/successor_of_prefix_even_more.rs index 4e00ea1..59b2a7a 100644 --- a/fuzz/fuzz_targets/successor_of_prefix_even_more.rs +++ b/fuzz/fuzz_targets/successor_of_prefix_even_more.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<4, 4, 16>, PathRc<4, 4, 16>)| { diff --git a/fuzz/fuzz_targets/successor_of_prefix_more.rs b/fuzz/fuzz_targets/successor_of_prefix_more.rs index 61837d8..9f2d87c 100644 --- a/fuzz/fuzz_targets/successor_of_prefix_more.rs +++ b/fuzz/fuzz_targets/successor_of_prefix_more.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; // use willow_data_model::path::*; -use willow_data_model_fuzz::path::*; +use willow_fuzz::path::*; // MCL, MCC, MPL fuzz_target!(|data: (PathRc<3, 3, 3>, PathRc<3, 3, 3>)| { diff --git a/fuzz/fuzz_targets/u16be_encoding.rs b/fuzz/fuzz_targets/u16be_encoding.rs index 8cc2749..cc9194f 100644 --- a/fuzz/fuzz_targets/u16be_encoding.rs +++ b/fuzz/fuzz_targets/u16be_encoding.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::encoding::U16BE; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; fuzz_target!(|data: (u16, TestConsumer)| { let (n, mut consumer) = data; diff --git a/fuzz/fuzz_targets/u16be_encoding_random.rs b/fuzz/fuzz_targets/u16be_encoding_random.rs index ae551c7..ebe95e6 100644 --- a/fuzz/fuzz_targets/u16be_encoding_random.rs +++ b/fuzz/fuzz_targets/u16be_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::encoding::U16BE; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; fuzz_target!(|data: &[u8]| { smol::block_on(async { diff --git a/fuzz/fuzz_targets/u32be_encoding.rs b/fuzz/fuzz_targets/u32be_encoding.rs index 6d63f34..c1d3593 100644 --- a/fuzz/fuzz_targets/u32be_encoding.rs +++ b/fuzz/fuzz_targets/u32be_encoding.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::encoding::U32BE; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; fuzz_target!(|data: (u32, TestConsumer)| { let (n, mut consumer) = data; diff --git a/fuzz/fuzz_targets/u32be_encoding_random.rs b/fuzz/fuzz_targets/u32be_encoding_random.rs index b676e18..64cd90a 100644 --- a/fuzz/fuzz_targets/u32be_encoding_random.rs +++ b/fuzz/fuzz_targets/u32be_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::encoding::U32BE; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; fuzz_target!(|data: &[u8]| { smol::block_on(async { diff --git a/fuzz/fuzz_targets/u64be_encoding.rs b/fuzz/fuzz_targets/u64be_encoding.rs index f9bcbfa..c499cb8 100644 --- a/fuzz/fuzz_targets/u64be_encoding.rs +++ b/fuzz/fuzz_targets/u64be_encoding.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::encoding::U64BE; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; fuzz_target!(|data: (u64, TestConsumer)| { let (n, mut consumer) = data; diff --git a/fuzz/fuzz_targets/u64be_encoding_random.rs b/fuzz/fuzz_targets/u64be_encoding_random.rs index b8e8883..896a2fb 100644 --- a/fuzz/fuzz_targets/u64be_encoding_random.rs +++ b/fuzz/fuzz_targets/u64be_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::encoding::U64BE; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; fuzz_target!(|data: &[u8]| { smol::block_on(async { diff --git a/fuzz/fuzz_targets/u8be_encoding.rs b/fuzz/fuzz_targets/u8be_encoding.rs index bc5a154..41a5dfa 100644 --- a/fuzz/fuzz_targets/u8be_encoding.rs +++ b/fuzz/fuzz_targets/u8be_encoding.rs @@ -3,7 +3,7 @@ use libfuzzer_sys::fuzz_target; use ufotofu::local_nb::consumer::TestConsumer; use willow_data_model::encoding::U8BE; -use willow_data_model_fuzz::encode::encoding_roundtrip; +use willow_fuzz::encode::encoding_roundtrip; fuzz_target!(|data: (u8, TestConsumer)| { let (n, mut consumer) = data; diff --git a/fuzz/fuzz_targets/u8be_encoding_random.rs b/fuzz/fuzz_targets/u8be_encoding_random.rs index d03e64c..b563eaa 100644 --- a/fuzz/fuzz_targets/u8be_encoding_random.rs +++ b/fuzz/fuzz_targets/u8be_encoding_random.rs @@ -2,7 +2,7 @@ use libfuzzer_sys::fuzz_target; use willow_data_model::encoding::U8BE; -use willow_data_model_fuzz::encode::encoding_random; +use willow_fuzz::encode::encoding_random; fuzz_target!(|data: &[u8]| { smol::block_on(async {