use patch libp2p-yamux 0.41.1 and release 0.25.1

rkuhn · rkuhn · commit e926778917e3 · 2022-11-15T15:39:35.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = [".", "cli", "harness"]
 
 [package]
 name = "ipfs-embed"
-version = "0.25.0"
+version = "0.25.1"
 authors = ["David Craven <david@craven.ch>", "Roland Kuhn <roland@actyx.io>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
diff --git a/harness/tests/netsim.rs b/harness/tests/netsim.rs
@@ -41,7 +41,7 @@ fn run(bin: &str, args: impl IntoIterator<Item = &'static str>) -> anyhow::Resul
 fn netsim_bitswap() -> anyhow::Result<()> {
     run(
         "bitswap",
-        ["--enable-mdns", "--tree-depth=2", "--tree-width=4"],
+        ["--enable-mdns", "--tree-depth=2", "--tree-width=10"],
     )
 }
 
@@ -54,7 +54,7 @@ fn netsim_bitswap_no_reuse() -> anyhow::Result<()> {
             "--enable-mdns",
             "--tree-depth=2",
             "--disable-port-reuse",
-            "--tree-width=4",
+            "--tree-width=10",
         ],
     )
 }
diff --git a/src/net/peer_info.rs b/src/net/peer_info.rs
@@ -3,7 +3,9 @@ use fnv::FnvHashMap;
 use libp2p::{
     core::ConnectedPoint, multiaddr::Protocol, swarm::DialError, Multiaddr, TransportError,
 };
-use std::{borrow::Cow, cmp::Ordering, collections::VecDeque, fmt::Write, time::Duration};
+use std::{
+    borrow::Cow, cmp::Ordering, collections::VecDeque, error::Error, fmt::Write, io, time::Duration,
+};
 
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct PeerInfo {
@@ -263,7 +265,7 @@ pub struct ConnectionFailure {
     debug: String,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ConnectionFailureKind {
     DialError,
     PeerDisconnected,
@@ -287,12 +289,12 @@ impl ConnectionFailure {
             DialError::Transport(e) => {
                 if e.len() == 1 {
                     // this should always be the case since we only get here for validation dials
-                    format!("transport error: {}", e[0].1)
+                    format!("transport error: {}", D(&e[0].1))
                 } else {
                     let mut s = "transport errors:".to_owned();
                     for (addr, err) in e {
                         s.push('\n');
-                        let _ = write!(&mut s, "{} {}", without_peer(addr), err);
+                        let _ = write!(&mut s, "{} {}", without_peer(addr), D(err));
                     }
                     s
                 }
@@ -313,7 +315,7 @@ impl ConnectionFailure {
             kind: ConnectionFailureKind::DialError,
             addr: without_peer(&addr).into_owned(),
             time: Utc::now(),
-            display: format!("transport error: {}", error),
+            display: format!("transport error: {}", D(error)),
             debug: format!("{:?}", error),
         }
     }
@@ -338,6 +340,10 @@ impl ConnectionFailure {
         }
     }
 
+    pub fn kind(&self) -> ConnectionFailureKind {
+        self.kind
+    }
+
     pub fn addr(&self) -> &Multiaddr {
         &self.addr
     }
@@ -354,3 +360,15 @@ impl ConnectionFailure {
         self.debug.as_str()
     }
 }
+
+struct D<'a>(&'a TransportError<io::Error>);
+
+impl<'a> std::fmt::Display for D<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)?;
+        if let Some(cause) = self.0.source() {
+            write!(f, "{}", cause)?;
+        }
+        Ok(())
+    }
+}
diff --git a/src/net/tests.rs b/src/net/tests.rs
@@ -1,5 +1,5 @@
 use super::{address_handler::IntoAddressHandler, *};
-use crate::net::peers::AddressBook;
+use crate::net::{peer_info::ConnectionFailureKind, peers::AddressBook};
 use async_executor::LocalExecutor;
 use futures::{future::ready, stream::StreamExt};
 use libp2p::{
@@ -111,6 +111,16 @@ fn test_dial_basic() {
         )
     );
     assert_eq!(book.peers().into_iter().next(), Some(peer_a));
+    let failure = book
+        .info(&peer_a)
+        .unwrap()
+        .recent_failures()
+        .next()
+        .cloned()
+        .unwrap();
+    assert_eq!(failure.kind(), ConnectionFailureKind::DialError);
+    assert_eq!(failure.addr(), &addr_2);
+    assert_eq!(failure.display(), "transport error: my other error");
     assert_eq!(dials(&mut book), vec![]);
 
     assert_eq!(

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ fn run(bin: &str, args: impl IntoIterator<Item = &'static str>) -> anyhow::Resul`
`41`	`41`	`fn netsim_bitswap() -> anyhow::Result<()> {`
`42`	`42`	`run(`
`43`	`43`	`"bitswap",`
`44`		`- ["--enable-mdns", "--tree-depth=2", "--tree-width=4"],`
	`44`	`+ ["--enable-mdns", "--tree-depth=2", "--tree-width=10"],`
`45`	`45`	`)`
`46`	`46`	`}`
`47`	`47`
`@@ -54,7 +54,7 @@ fn netsim_bitswap_no_reuse() -> anyhow::Result<()> {`
`54`	`54`	`"--enable-mdns",`
`55`	`55`	`"--tree-depth=2",`
`56`	`56`	`"--disable-port-reuse",`
`57`		`- "--tree-width=4",`
	`57`	`+ "--tree-width=10",`
`58`	`58`	`],`
`59`	`59`	`)`
`60`	`60`	`}`