protocols/plaintext: Remove wrong debug log (#1759)

Don't log errors happening after plaintext handshake as errors happening
during plaintext handshake.

Author: mxinden

Cargo.toml

@@ -71,7 +71,7 @@ libp2p-kad = { version = "0.23.1", path = "protocols/kad", optional = true }
 libp2p-mplex = { version = "0.22.0", path = "muxers/mplex", optional = true }
 libp2p-noise = { version = "0.24.1", path = "protocols/noise", optional = true }
 libp2p-ping = { version = "0.22.0", path = "protocols/ping", optional = true }
-libp2p-plaintext = { version = "0.22.0", path = "protocols/plaintext", optional = true }
+libp2p-plaintext = { version = "0.22.1", path = "protocols/plaintext", optional = true }
 libp2p-pnet = { version = "0.19.1", path = "protocols/pnet", optional = true }
 libp2p-request-response = { version = "0.3.0", path = "protocols/request-response", optional = true }
 libp2p-swarm = { version = "0.22.0", path = "swarm" }

protocols/plaintext/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.22.1 [unreleased]
+
+- Improve error logging.
+
 # 0.22.0 [2020-09-09]
 
 - Bump `libp2p-core` dependency.

protocols/plaintext/Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p-plaintext"
 edition = "2018"
 description = "Plaintext encryption dummy protocol for libp2p"
-version = "0.22.0"
+version = "0.22.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

protocols/plaintext/src/lib.rs

@@ -152,24 +152,20 @@ impl PlainText2Config {
     where
         T: AsyncRead + AsyncWrite + Send + Unpin + 'static
     {
-        debug!("Starting plaintext upgrade");
+        debug!("Starting plaintext handshake.");
         let (stream_sink, remote) = PlainTextMiddleware::handshake(socket, self).await?;
-        let mapped = stream_sink.map_err(map_err as fn(_) -> _);
+        debug!("Finished plaintext handshake.");
+
         Ok((
             remote.peer_id,
             PlainTextOutput {
-                stream: RwStreamSink::new(mapped),
+                stream: RwStreamSink::new(stream_sink),
                 remote_key: remote.public_key,
             }
         ))
     }
 }
 
-fn map_err(err: io::Error) -> io::Error {
-    debug!("error during plaintext handshake {:?}", err);
-    io::Error::new(io::ErrorKind::InvalidData, err)
-}
-
 pub struct PlainTextMiddleware<S> {
     inner: Framed<S, UviBytes<BytesMut>>,
 }
@@ -226,7 +222,7 @@ where
     S: AsyncRead + AsyncWrite + Unpin,
 {
     /// The plaintext stream.
-    pub stream: RwStreamSink<futures::stream::MapErr<PlainTextMiddleware<S>, fn(io::Error) -> io::Error>>,
+    pub stream: RwStreamSink<PlainTextMiddleware<S>>,
     /// The public key of the remote.
     pub remote_key: PublicKey,
 }