From cb94baf9c4081a78a889957c93baa16aff3511de Mon Sep 17 00:00:00 2001
From: Tanguy Cizain <tanguycizain@gmail.com>
Date: Mon, 19 Jul 2021 12:51:27 +0200
Subject: [PATCH] Fix transport's switch start (#609)

* fix switch start

* don't fail eagerly on transport start

* handlecancel

* raise exc
---
 libp2p/switch.nim | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/libp2p/switch.nim b/libp2p/switch.nim
index 66bea4ef8..c4a653113 100644
--- a/libp2p/switch.nim
+++ b/libp2p/switch.nim
@@ -203,25 +203,6 @@ proc accept(s: Switch, transport: Transport) {.async.} = # noraises
         await conn.close()
       return
 
-proc start*(s: Switch): Future[seq[Future[void]]] {.async, gcsafe.} =
-  trace "starting switch for peer", peerInfo = s.peerInfo
-  var startFuts: seq[Future[void]]
-  for t in s.transports: # for each transport
-    for i, a in s.peerInfo.addrs:
-      if t.handles(a): # check if it handles the multiaddr
-        var server = t.start(a)
-        s.peerInfo.addrs[i] = t.ma # update peer's address
-        s.acceptFuts.add(s.accept(t))
-        startFuts.add(server)
-
-  proc peerIdentifiedHandler(peerInfo: PeerInfo, event: PeerEvent) {.async.} =
-    s.peerStore.replace(peerInfo)
-
-  s.connManager.addPeerEventHandler(peerIdentifiedHandler, PeerEventKind.Identified)
-
-  debug "Started libp2p node", peer = s.peerInfo
-  return startFuts # listen for incoming connections
-
 proc stop*(s: Switch) {.async.} =
   trace "Stopping switch"
 
@@ -250,6 +231,33 @@ proc stop*(s: Switch) {.async.} =
 
   trace "Switch stopped"
 
+proc start*(s: Switch): Future[seq[Future[void]]] {.async, gcsafe.} =
+  trace "starting switch for peer", peerInfo = s.peerInfo
+  var startFuts: seq[Future[void]]
+  for t in s.transports: # for each transport
+    for i, a in s.peerInfo.addrs:
+      if t.handles(a): # check if it handles the multiaddr
+        let transpStart = t.start(a)
+        startFuts.add(transpStart)
+        try:
+          await transpStart
+          s.peerInfo.addrs[i] = t.ma # update peer's address
+          s.acceptFuts.add(s.accept(t))
+        except CancelledError as exc:
+          await s.stop()
+          raise exc
+        except CatchableError as exc:
+          debug "Failed to start one transport", address = $a, err = exc.msg
+          continue
+
+  proc peerIdentifiedHandler(peerInfo: PeerInfo, event: PeerEvent) {.async.} =
+    s.peerStore.replace(peerInfo)
+
+  s.connManager.addPeerEventHandler(peerIdentifiedHandler, PeerEventKind.Identified)
+
+  debug "Started libp2p node", peer = s.peerInfo
+  return startFuts # listen for incoming connections
+
 proc newSwitch*(peerInfo: PeerInfo,
                 transports: seq[Transport],
                 identity: Identify,