Merge branch 'main' into next-0.10

4 files changed, 5 insertions, 4 deletions

diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index 9fb562a3..3b555b8b 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -17,6 +17,7 @@ path = "lib.rs"
 garage_model.workspace = true
 garage_table.workspace = true
 garage_block.workspace = true
+garage_net.workspace = true
 garage_util.workspace = true
 garage_rpc.workspace = true
 
@@ -45,7 +46,7 @@ http.workspace = true
 httpdate.workspace = true
 http-range.workspace = true
 http-body-util.workspace = true
-hyper.workspace = true
+hyper = { workspace = true, default-features = false, features = ["server", "http1"] }
 hyper-util.workspace = true
 multer.workspace = true
 percent-encoding.workspace = true
diff --git a/src/api/s3/copy.rs b/src/api/s3/copy.rs
index ba9bfc88..7eb1fe60 100644
--- a/src/api/s3/copy.rs
+++ b/src/api/s3/copy.rs
@@ -9,7 +9,7 @@ use bytes::Bytes;
 use hyper::{Request, Response};
 use serde::Serialize;
 
-use garage_rpc::netapp::bytes_buf::BytesBuf;
+use garage_net::bytes_buf::BytesBuf;
 use garage_rpc::rpc_helper::OrderTag;
 use garage_table::*;
 use garage_util::data::*;
diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs
index 8902b14c..6dd68360 100644
--- a/src/api/s3/put.rs
+++ b/src/api/s3/put.rs
@@ -16,7 +16,7 @@ use opentelemetry::{
 	Context,
 };
 
-use garage_rpc::netapp::bytes_buf::BytesBuf;
+use garage_net::bytes_buf::BytesBuf;
 use garage_table::*;
 use garage_util::async_hash::*;
 use garage_util::data::*;
diff --git a/src/api/signature/streaming.rs b/src/api/signature/streaming.rs
index 39147ca0..a2a71f6b 100644
--- a/src/api/signature/streaming.rs
+++ b/src/api/signature/streaming.rs
@@ -349,7 +349,7 @@ mod tests {
 			crate::signature::signing_hmac(&datetime, secret_key, region, "s3").unwrap();
 
 		let data: &[&[u8]] = &[b"1"];
-		let body = futures::stream::iter(data.iter().map(|block| Ok(block.as_ref().into())));
+		let body = futures::stream::iter(data.iter().map(|block| Ok(block.to_vec().into())));
 
 		let seed_signature = Hash::default();