enforced f-strings everywhere, %s on logging

extended _multiaddr_from_socket to support UDP and IPv6 automatically
changed TCPListener to use _ip4_or_6_from_multiaddr to get host, and not ip4 only

enforced `from error` everywhere with raises
added call braces to exceptions

libp2p/network/connection/raw_connection.py

@@ -29,7 +29,7 @@ class RawConnection(IRawConnection):
         try:
             self.writer.write(data)
         except ConnectionResetError as error:
-            raise RawConnError(error)
+            raise RawConnError() from error
         # Reference: https://github.com/ethereum/lahja/blob/93610b2eb46969ff1797e0748c7ac2595e130aef/lahja/asyncio/endpoint.py#L99-L102  # noqa: E501
         # Use a lock to serialize drain() calls. Circumvents this bug:
         # https://bugs.python.org/issue29930
@@ -37,7 +37,7 @@ class RawConnection(IRawConnection):
             try:
                 await self.writer.drain()
             except ConnectionResetError as error:
-                raise RawConnError(error)
+                raise RawConnError() from error
 
     async def read(self, n: int = -1) -> bytes:
         """
@@ -49,7 +49,7 @@ class RawConnection(IRawConnection):
         try:
             return await self.reader.read(n)
         except ConnectionResetError as error:
-            raise RawConnError(error)
+            raise RawConnError() from error
 
     async def close(self) -> None:
         self.writer.close()

libp2p/network/stream/net_stream.py

@@ -47,9 +47,9 @@ class NetStream(INetStream):
         try:
             return await self.muxed_stream.read(n)
         except MuxedStreamEOF as error:
-            raise StreamEOF from error
+            raise StreamEOF() from error
         except MuxedStreamReset as error:
-            raise StreamReset from error
+            raise StreamReset() from error
 
     async def write(self, data: bytes) -> int:
         """
@@ -60,7 +60,7 @@ class NetStream(INetStream):
         try:
             return await self.muxed_stream.write(data)
         except MuxedStreamClosed as error:
-            raise StreamClosed from error
+            raise StreamClosed() from error
 
     async def close(self) -> None:
         """close stream."""

libp2p/network/swarm.py

@@ -87,8 +87,8 @@ class Swarm(INetwork):
         try:
             # Get peer info from peer store
             addrs = self.peerstore.addrs(peer_id)
-        except PeerStoreError:
-            raise SwarmException(f"No known addresses to peer {peer_id}")
+        except PeerStoreError as e:
+            raise SwarmException(f"No known addresses to peer {peer_id}") from e
 
         if not addrs:
             raise SwarmException(f"No known addresses to peer {peer_id}")
@@ -101,7 +101,7 @@ class Swarm(INetwork):
         except OpenConnectionError as error:
             logger.debug("fail to dial peer %s over base transport", peer_id)
             raise SwarmException(
-                "fail to open connection to peer %s", peer_id
+                f"fail to open connection to peer {peer_id}"
             ) from error
 
         logger.debug("dialed peer %s over base transport", peer_id)
@@ -111,20 +111,20 @@ class Swarm(INetwork):
         try:
             secured_conn = await self.upgrader.upgrade_security(raw_conn, peer_id, True)
         except SecurityUpgradeFailure as error:
-            error_msg = "fail to upgrade security for peer %s"
-            logger.debug(error_msg, peer_id)
+            logger.debug("failed to upgrade security for peer %s", peer_id)
             await raw_conn.close()
-            raise SwarmException(error_msg % peer_id) from error  # wip
+            raise SwarmException(
+                f"failed to upgrade security for peer {peer_id}"
+            ) from error
 
         logger.debug("upgraded security for peer %s", peer_id)
 
         try:
             muxed_conn = await self.upgrader.upgrade_connection(secured_conn, peer_id)
         except MuxerUpgradeFailure as error:
-            error_msg = "fail to upgrade mux for peer %s"
-            logger.debug(error_msg, peer_id)
+            logger.debug("failed to upgrade mux for peer %s", peer_id)
             await secured_conn.close()
-            raise SwarmException(error_msg % peer_id) from error  # wip
+            raise SwarmException(f"failed to upgrade mux for peer {peer_id}") from error
 
         logger.debug("upgraded mux for peer %s", peer_id)
 
@@ -187,10 +187,11 @@ class Swarm(INetwork):
                         raw_conn, ID(b""), False
                     )
                 except SecurityUpgradeFailure as error:
-                    error_msg = "fail to upgrade security for peer at %s"
-                    logger.debug(error_msg, peer_addr)
+                    logger.debug("failed to upgrade security for peer at %s", peer_addr)
                     await raw_conn.close()
-                    raise SwarmException(error_msg % peer_addr) from error  # wip
+                    raise SwarmException(
+                        f"failed to upgrade security for peer at {peer_addr}"
+                    ) from error
                 peer_id = secured_conn.get_remote_peer()
 
                 logger.debug("upgraded security for peer at %s", peer_addr)
@@ -201,10 +202,11 @@ class Swarm(INetwork):
                         secured_conn, peer_id
                     )
                 except MuxerUpgradeFailure as error:
-                    error_msg = "fail to upgrade mux for peer %s"
-                    logger.debug(error_msg, peer_id)
+                    logger.debug("fail to upgrade mux for peer %s", peer_id)
                     await secured_conn.close()
-                    raise SwarmException(error_msg % peer_id) from error  # wip
+                    raise SwarmException(
+                        f"fail to upgrade mux for peer {peer_id}"
+                    ) from error
                 logger.debug("upgraded mux for peer %s", peer_id)
 
                 await self.add_conn(muxed_conn)
@@ -223,7 +225,7 @@ class Swarm(INetwork):
                 return True
             except IOError:
                 # Failed. Continue looping.
-                logger.debug("fail to listen on: " + str(maddr))
+                logger.debug("fail to listen on: %s", maddr)
 
         # No maddr succeeded
         return False