Merge origin/fix_timeout into relative-encodings

earthstar-project · Jul 21, 2024 · bb714df · bb714df
2 parents 14926c0 + c5f5965
commit bb714df
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/data-model/Cargo.toml b/data-model/Cargo.toml
@@ -10,7 +10,7 @@ dev = ["dep:arbitrary"]
 [dependencies]
 either = "1.10.0"
 arbitrary = { version = "1.0.2", features = ["derive"], optional = true }
-ufotofu = "0.2.0"
+ufotofu = "0.3.0"
 bytes = "1.6.0"
 
 [dev-dependencies]

diff --git a/data-model/src/encoding/compact_width.rs b/data-model/src/encoding/compact_width.rs
@@ -146,7 +146,7 @@ pub async fn decode_compact_width_be<Producer: BulkProducer<Item = u8>>(
 #[cfg(test)]
 mod tests {
     use ufotofu::local_nb::consumer::IntoVec;
-    use ufotofu::local_nb::producer::FromVec;
+    use ufotofu::local_nb::producer::FromBoxedSlice;
 
     use super::*;
 
@@ -230,7 +230,7 @@ mod tests {
 
                 assert_eq!(decoded_compact_width, compact_width);
 
-                let mut producer = FromVec::new(encode_result);
+                let mut producer = FromBoxedSlice::from_vec(encode_result);
 
                 let decode_result = decode_compact_width_be(decoded_compact_width, &mut producer)
                     .await

diff --git a/earthstar/Cargo.toml b/earthstar/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 either = "1.10.0"
 willow-data-model = { path = "../data-model" }
 arbitrary = { version = "1.0.2", features = ["derive"]}
-ufotofu = "0.2.0"
+ufotofu = "0.3.0"
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 cargo-fuzz = true
 
 [dependencies]
-ufotofu ={ version = "0.2.0", features=["dev"]}
+ufotofu = { version = "0.3.0", features=["dev"]}
 smol = "2.0.0"
-arbitrary = { version = "1.0.2", features = ["derive"]}
+arbitrary = { version = "1.0.2", features = ["derive"] }
 libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 
 

diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs
@@ -1,7 +1,7 @@
 use ufotofu::{
     common::consumer::TestConsumer,
     local_nb::{
-        producer::{FromSlice, FromVec},
+        producer::{FromSlice, FromBoxedSlice},
         BufferedConsumer, BulkConsumer,
     },
     sync::consumer::IntoVec,
@@ -31,7 +31,7 @@ where
     new_vec.extend_from_slice(consumer.as_ref());
 
     // THis should eventually be a testproducer, when we are able to initialise one with some known data.
-    let mut producer = FromVec::new(new_vec);
+    let mut producer = FromBoxedSlice::from_vec(new_vec);
 
     // Check for correct errors
     let decoded_item = T::decode(&mut producer).await.unwrap();
@@ -95,7 +95,7 @@ pub async fn relative_encoding_roundtrip<T, R, C>(
     new_vec.extend_from_slice(consumer.as_ref());
 
     // THis should eventually be a testproducer, when we are able to initialise one with some known data.
-    let mut producer = FromVec::new(new_vec);
+    let mut producer = FromBoxedSlice::from_vec(new_vec);
 
     // Check for correct errors
     let decoded_item = T::relative_decode(&reference, &mut producer).await.unwrap();