refactor(noise): modify message framing

Cargo.toml

@@ -89,7 +89,7 @@ libp2p-memory-connection-limits = { version = "0.1.0", path = "misc/memory-conne
 libp2p-metrics = { version = "0.13.1", path = "misc/metrics" }
 libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
-libp2p-noise = { version = "0.43.1", path = "transports/noise" }
+libp2p-noise = { version = "0.43.2", path = "transports/noise" }
 libp2p-perf = { version = "0.2.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.43.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.40.0", path = "transports/plaintext" }

transports/noise/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.43.2
+
+- Refactor noise io framing.
+  This migrates to the `asynchronous_codec::Framed` type to provide an implementation of `Sink` and
+  `Stream` for noise payloads.
+  See [PR 4548].
+
+[PR 4544]: https://github.com/libp2p/rust-libp2p/pull/4548
+
 ## 0.43.1
 
 - Update dependencies.

transports/noise/Cargo.toml

@@ -3,12 +3,13 @@ name = "libp2p-noise"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.43.1"
+version = "0.43.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 
 [dependencies]
+asynchronous-codec = "0.6"
 bytes = "1"
 curve25519-dalek = "4.1.0"
 futures = "0.3.28"
@@ -18,6 +19,7 @@ log = "0.4"
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 once_cell = "1.18.0"
+pin-project = "1.1.3"
 quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.7"

transports/noise/src/io.rs

@@ -29,7 +29,7 @@ use futures::ready;
 use log::trace;
 use std::{
     cmp::min,
-    fmt, io,
+    io,
     pin::Pin,
     task::{Context, Poll},
 };
@@ -45,12 +45,6 @@ pub struct Output<T> {
     send_offset: usize,
 }
 
-impl<T> fmt::Debug for Output<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("NoiseOutput").field("io", &self.io).finish()
-    }
-}
-
 impl<T> Output<T> {
     fn new(io: NoiseFramed<T, snow::TransportState>) -> Self {
         Output {
@@ -113,7 +107,7 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for Output<T> {
         if this.send_offset == MAX_FRAME_LEN {
             trace!("write: sending {} bytes", MAX_FRAME_LEN);
             ready!(io.as_mut().poll_ready(cx))?;
-            io.as_mut().start_send(frame_buf)?;
+            io.as_mut().start_send(frame_buf.clone())?;
             this.send_offset = 0;
         }
 
@@ -137,7 +131,7 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for Output<T> {
         if this.send_offset > 0 {
             ready!(io.as_mut().poll_ready(cx))?;
             trace!("flush: sending {} bytes", this.send_offset);
-            io.as_mut().start_send(frame_buf)?;
+            io.as_mut().start_send(frame_buf.clone())?;
             this.send_offset = 0;
         }