From c1ffc0ab0740136ea3c947c21eb11ef248433f89 Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 11 Sep 2019 17:13:21 +0800 Subject: [PATCH 1/3] Fix `transport.dial` in swarm --- libp2p/network/swarm.py | 2 +- libp2p/transport/transport_interface.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 5ce7f5459..e5b546936 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -119,7 +119,7 @@ async def dial_peer(self, peer_id: ID) -> IMuxedConn: multiaddr = self.router.find_peer(peer_id) # Dial peer (connection to peer does not yet exist) # Transport dials peer (gets back a raw conn) - raw_conn = await self.transport.dial(multiaddr, self.self_id) + raw_conn = await self.transport.dial(multiaddr) logger.debug("dialed peer %s over base transport", peer_id) diff --git a/libp2p/transport/transport_interface.py b/libp2p/transport/transport_interface.py index 2f5a1ac66..ca8b5c345 100644 --- a/libp2p/transport/transport_interface.py +++ b/libp2p/transport/transport_interface.py @@ -3,7 +3,6 @@ from multiaddr import Multiaddr from libp2p.network.connection.raw_connection_interface import IRawConnection -from libp2p.peer.id import ID from .listener_interface import IListener from .typing import THandler @@ -11,7 +10,7 @@ class ITransport(ABC): @abstractmethod - async def dial(self, maddr: Multiaddr, self_id: ID) -> IRawConnection: + async def dial(self, maddr: Multiaddr) -> IRawConnection: """ dial a transport to peer listening on multiaddr :param multiaddr: multiaddr of peer From 451f9930584c7bbc8a8f954eb819682c6b58d232 Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 11 Sep 2019 18:05:41 +0800 Subject: [PATCH 2/3] Fix isort --- libp2p/network/swarm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index e5b546936..2b54328f3 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -1,6 +1,6 @@ import asyncio -from typing import Callable, Dict, List, Sequence import logging +from typing import Callable, Dict, List, Sequence from multiaddr import Multiaddr From 8c8c206c3304b90e1d2cc5f1a0d110abedeb05da Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 11 Sep 2019 18:33:52 +0800 Subject: [PATCH 3/3] flake8 --- libp2p/transport/tcp/tcp.py | 1 - 1 file changed, 1 deletion(-) diff --git a/libp2p/transport/tcp/tcp.py b/libp2p/transport/tcp/tcp.py index 90bf19659..a63dbd0c6 100644 --- a/libp2p/transport/tcp/tcp.py +++ b/libp2p/transport/tcp/tcp.py @@ -6,7 +6,6 @@ from libp2p.network.connection.raw_connection import RawConnection from libp2p.network.connection.raw_connection_interface import IRawConnection -from libp2p.peer.id import ID from libp2p.transport.listener_interface import IListener from libp2p.transport.transport_interface import ITransport from libp2p.transport.typing import THandler