Merge pull request #34 from earthstar-project/repackaging

Repackaging
earthstar-project · Aug 6, 2024 · 1194c22 · 1194c22
2 parents 5f063e5 + fc65876
commit 1194c22
Show file tree

Hide file tree

Showing 76 changed files with 287 additions and 255 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/data-model/src/encoding/compact_width.rs b/data-model/src/encoding/compact_width.rs
@@ -117,8 +117,8 @@ pub mod encoding {
 
     use crate::encoding::unsigned_int::{U16BE, U32BE, U64BE, U8BE};
 
-    #[syncify_replace(use crate::encoding::parameters_sync::{Decodable, };)]
-    use crate::encoding::parameters::Decodable;
+    #[syncify_replace(use crate::encoding::sync::{Decodable};)]
+    use crate::encoding::Decodable;
 
     /// Encode a `u64` integer as a `compact_width(value)`-byte big-endian integer, and consume that with a [`BulkConsumer`].
     pub async fn encode_compact_width_be<Consumer: BulkConsumer<Item = u8>>(

diff --git a/data-model/src/encoding/mod.rs b/data-model/src/encoding/mod.rs
@@ -1,15 +1,32 @@
-pub mod bytes;
-pub mod compact_width;
-pub mod error;
-pub mod parameters;
-pub mod parameters_sync;
-pub mod relativity;
+mod bytes;
+mod compact_width;
+mod error;
+mod max_power;
+mod traits_sync;
+mod unsigned_int;
+
+pub use bytes::encoding::produce_byte;
+pub use bytes::is_bitflagged;
+
+pub use compact_width::encoding::*;
+pub use compact_width::CompactWidth;
+
+pub use error::*;
+
+mod traits;
+pub use traits::*;
+
+mod relativity;
+
 pub(crate) mod shared_buffers;
-pub mod unsigned_int;
 
-pub mod max_power;
-pub mod max_power_sync {
-    use super::max_power;
-    pub use max_power::encoding_sync::*;
-    pub use max_power::max_power;
+pub use unsigned_int::*;
+
+pub use max_power::{decode_max_power, encode_max_power, max_power};
+
+pub mod sync {
+    pub use super::bytes::encoding_sync::produce_byte;
+    pub use super::compact_width::encoding_sync::*;
+    pub use super::max_power::encoding_sync::*;
+    pub use super::traits_sync::*;
 }
diff --git a/data-model/src/encoding/relativity.rs b/data-model/src/encoding/relativity.rs
@@ -8,10 +8,10 @@ pub(super) mod encoding {
     #[syncify_replace(use ufotofu::sync::{BulkConsumer, BulkProducer};)]
     use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 
-    #[syncify_replace(use crate::encoding::parameters_sync::{Encodable, Decodable, RelativeDecodable, RelativeEncodable};)]
-    use crate::encoding::parameters::{Decodable, Encodable, RelativeDecodable, RelativeEncodable};
+    #[syncify_replace(use crate::encoding::sync::{Encodable, Decodable, RelativeDecodable, RelativeEncodable};)]
+    use crate::encoding::{Decodable, Encodable, RelativeDecodable, RelativeEncodable};
 
-    #[syncify_replace(use crate::encoding::max_power_sync::{decode_max_power, encode_max_power};)]
+    #[syncify_replace(use crate::encoding::sync::{decode_max_power, encode_max_power};)]
     use crate::encoding::max_power::{decode_max_power, encode_max_power};
 
     #[syncify_replace(use crate::encoding::compact_width::encoding_sync::{ decode_compact_width_be, encode_compact_width_be};)]
@@ -30,11 +30,7 @@ pub(super) mod encoding {
             shared_buffers::ScratchSpacePathDecoding,
         },
         entry::Entry,
-        grouping::{
-            area::{Area, AreaSubspace},
-            range::{Range, RangeEnd},
-            range_3d::Range3d,
-        },
+        grouping::{Area, AreaSubspace, Range, Range3d, RangeEnd},
         parameters::{NamespaceId, PayloadDigest, SubspaceId},
         path::Path,
     };

diff --git a/data-model/src/encoding/parameters.rs → data-model/src/encoding/traits.rs b/data-model/src/encoding/parameters.rs → data-model/src/encoding/traits.rs
diff --git a/data-model/src/encoding/parameters_sync.rs → data-model/src/encoding/traits_sync.rs b/data-model/src/encoding/parameters_sync.rs → data-model/src/encoding/traits_sync.rs
diff --git a/data-model/src/encoding/unsigned_int.rs b/data-model/src/encoding/unsigned_int.rs
@@ -76,8 +76,8 @@ mod encoding {
     #[syncify_replace(use ufotofu::sync::{BulkConsumer, BulkProducer};)]
     use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 
-    #[syncify_replace(use crate::encoding::parameters_sync::{Decodable, Encodable};)]
-    use crate::encoding::parameters::{Decodable, Encodable};
+    #[syncify_replace(use crate::encoding::sync::{Decodable, Encodable};)]
+    use crate::encoding::{Decodable, Encodable};
 
     impl Encodable for U8BE {
         async fn encode<Consumer>(&self, consumer: &mut Consumer) -> Result<(), Consumer::Error>

diff --git a/data-model/src/entry.rs b/data-model/src/entry.rs
@@ -4,7 +4,7 @@ use arbitrary::size_hint::and_all;
 use arbitrary::Arbitrary;
 
 use crate::{
-    encoding::{error::DecodeError, unsigned_int::U64BE},
+    encoding::{DecodeError, U64BE},
     parameters::{IsAuthorisedWrite, NamespaceId, PayloadDigest, SubspaceId},
     path::Path,
 };
@@ -121,8 +121,8 @@ mod encoding {
     #[syncify_replace(use ufotofu::sync::{BulkConsumer, BulkProducer};)]
     use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 
-    #[syncify_replace(use crate::encoding::parameters_sync::{Decodable, Encodable};)]
-    use crate::encoding::parameters::{Decodable, Encodable};
+    #[syncify_replace(use crate::encoding::sync::{Decodable, Encodable};)]
+    use crate::encoding::{Decodable, Encodable};
 
     impl<const MCL: usize, const MCC: usize, const MPL: usize, N, S, PD> Encodable
         for Entry<MCL, MCC, MPL, N, S, PD>

diff --git a/data-model/src/grouping/mod.rs b/data-model/src/grouping/mod.rs
@@ -1,4 +1,8 @@
-pub mod area;
-pub mod area_of_interest;
-pub mod range;
-pub mod range_3d;
+mod area;
+pub use area::*;
+mod area_of_interest;
+pub use area_of_interest::*;
+mod range;
+pub use range::*;
+mod range_3d;
+pub use range_3d::*;
diff --git a/data-model/src/lib.rs b/data-model/src/lib.rs
@@ -1,3 +1,5 @@
+//! Allo!
+
 #![feature(
     new_uninit,
     async_fn_traits,
@@ -8,7 +10,12 @@
 )]
 
 pub mod encoding;
-pub mod entry;
+mod entry;
+pub use entry::*;
 pub mod grouping;
-pub mod parameters;
-pub mod path;
+
+mod parameters;
+pub use parameters::*;
+
+mod path;
+pub use path::*;
diff --git a/data-model/src/path.rs b/data-model/src/path.rs
@@ -787,16 +787,16 @@ use syncify::syncify_replace;
 mod encoding {
     use super::*;
 
-    use crate::encoding::{error::DecodeError, shared_buffers::ScratchSpacePathDecoding};
+    use crate::encoding::{shared_buffers::ScratchSpacePathDecoding, DecodeError};
 
     #[syncify_replace(use ufotofu::sync::{BulkConsumer, BulkProducer};)]
     use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 
-    #[syncify_replace(use crate::encoding::parameters_sync::{Decodable, Encodable};)]
-    use crate::encoding::parameters::{Decodable, Encodable};
+    #[syncify_replace(use crate::encoding::sync::{Decodable, Encodable};)]
+    use crate::encoding::{Decodable, Encodable};
 
-    #[syncify_replace(use crate::encoding::max_power_sync::{decode_max_power, encode_max_power};)]
-    use crate::encoding::max_power::{decode_max_power, encode_max_power};
+    #[syncify_replace(use crate::encoding::sync::{decode_max_power, encode_max_power};)]
+    use crate::encoding::{decode_max_power, encode_max_power};
 
     impl<const MCL: usize, const MCC: usize, const MPL: usize> Encodable for Path<MCL, MCC, MPL> {
         async fn encode<C>(&self, consumer: &mut C) -> Result<(), C::Error>
@@ -935,7 +935,7 @@ impl<'a, const MCL: usize, const MCC: usize, const MPL: usize> Arbitrary<'a>
 /// Like core::iter::Chain, but implements ExactSizeIter if both components implement it. Panics if the resulting length overflows.
 ///
 /// Code liberally copy-pasted from the standard library.
-pub struct ExactLengthChain<A, B> {
+struct ExactLengthChain<A, B> {
     a: Option<A>,
     b: Option<B>,
 }

diff --git a/earthstar/src/cinn25519.rs b/earthstar/src/cinn25519.rs
@@ -4,10 +4,7 @@ use arbitrary::{
 };
 use either::Either;
 use ufotofu::local_nb::{BulkConsumer, BulkProducer};
-use willow_data_model::encoding::{
-    error::DecodeError,
-    parameters::{Decodable, Encodable},
-};
+use willow_data_model::encoding::{Decodable, DecodeError, Encodable};
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Shortname<const MIN_LENGTH: usize, const MAX_LENGTH: usize>(pub Vec<u8>);

diff --git a/earthstar/src/identity_id.rs b/earthstar/src/identity_id.rs
@@ -1,11 +1,8 @@
 use arbitrary::Arbitrary;
 use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 use willow_data_model::{
-    encoding::{
-        error::DecodeError,
-        parameters::{Decodable, Encodable},
-    },
-    parameters::SubspaceId,
+    encoding::{Decodable, DecodeError, Encodable},
+    SubspaceId,
 };
 
 use crate::cinn25519::{Cinn25519PublicKey, Shortname};

diff --git a/earthstar/src/namespace_id.rs b/earthstar/src/namespace_id.rs
@@ -1,11 +1,8 @@
 use arbitrary::Arbitrary;
 use ufotofu::local_nb::{BulkConsumer, BulkProducer};
 use willow_data_model::{
-    encoding::{
-        error::DecodeError,
-        parameters::{Decodable, Encodable},
-    },
-    parameters::NamespaceId,
+    encoding::{Decodable, DecodeError, Encodable},
+    NamespaceId,
 };
 
 use crate::cinn25519::{Cinn25519PublicKey, Shortname};

diff --git 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
@@ -3,8 +3,8 @@
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use libfuzzer_sys::fuzz_target;
 use ufotofu::local_nb::consumer::TestConsumer;
-use willow_data_model::grouping::area::Area;
-use willow_data_model_fuzz::encode::relative_encoding_roundtrip;
+use willow_data_model::grouping::Area;
+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
@@ -2,8 +2,8 @@
 
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use libfuzzer_sys::fuzz_target;
-use willow_data_model::grouping::area::Area;
-use willow_data_model_fuzz::encode::relative_encoding_random_less_strict;
+use willow_data_model::grouping::Area;
+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
@@ -4,9 +4,9 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
 use ufotofu::local_nb::consumer::TestConsumer;
-use willow_data_model::entry::Entry;
-use willow_data_model_fuzz::encode::encoding_roundtrip;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::Entry;
+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
@@ -3,10 +3,10 @@
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 
-use willow_data_model::entry::Entry;
+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
@@ -4,9 +4,9 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
 use ufotofu::local_nb::consumer::TestConsumer;
-use willow_data_model::entry::Entry;
-use willow_data_model_fuzz::encode::relative_encoding_roundtrip;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::Entry;
+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
@@ -3,9 +3,9 @@
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
-use willow_data_model::entry::Entry;
-use willow_data_model_fuzz::encode::relative_encoding_random_less_strict;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::Entry;
+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
@@ -4,10 +4,10 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
 use ufotofu::local_nb::consumer::TestConsumer;
-use willow_data_model::entry::Entry;
-use willow_data_model::grouping::area::Area;
-use willow_data_model_fuzz::encode::relative_encoding_roundtrip;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::grouping::Area;
+use willow_data_model::Entry;
+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
@@ -3,10 +3,10 @@
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
-use willow_data_model::entry::Entry;
-use willow_data_model::grouping::area::Area;
-use willow_data_model_fuzz::encode::relative_encoding_random_less_strict;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::grouping::Area;
+use willow_data_model::Entry;
+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
@@ -4,10 +4,10 @@ use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
 use ufotofu::local_nb::consumer::TestConsumer;
-use willow_data_model::entry::Entry;
-use willow_data_model::grouping::range_3d::Range3d;
-use willow_data_model_fuzz::encode::relative_encoding_roundtrip;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::grouping::Range3d;
+use willow_data_model::Entry;
+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
@@ -3,10 +3,10 @@
 use earthstar::identity_id::IdentityIdentifier as IdentityId;
 use earthstar::namespace_id::NamespaceIdentifier as EsNamespaceId;
 use libfuzzer_sys::fuzz_target;
-use willow_data_model::entry::Entry;
-use willow_data_model::grouping::range_3d::Range3d;
-use willow_data_model_fuzz::encode::relative_encoding_random_less_strict;
-use willow_data_model_fuzz::placeholder_params::FakePayloadDigest;
+use willow_data_model::grouping::Range3d;
+use willow_data_model::Entry;
+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
@@ -1,8 +1,8 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use meadowcap::{mc_capability::McCapability, Delegation, InvalidDelegationError};
-use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySig};
+use meadowcap::{Delegation, InvalidDelegationError, McCapability};
+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
@@ -1,9 +1,9 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use meadowcap::{mc_capability::McCapability, FailedDelegationError};
-use willow_data_model::grouping::area::Area;
-use willow_data_model_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig};
+use meadowcap::{FailedDelegationError, McCapability};
+use willow_data_model::grouping::Area;
+use willow_fuzz::silly_sigs::{SillyPublicKey, SillySecret, SillySig};
 
 fuzz_target!(|data: (
     SillySecret,