diff --git a/libp2p/network/connection/raw_connection.py b/libp2p/network/connection/raw_connection.py index 0d20de5..73de89f 100644 --- a/libp2p/network/connection/raw_connection.py +++ b/libp2p/network/connection/raw_connection.py @@ -4,9 +4,6 @@ from .raw_connection_interface import IRawConnection class RawConnection(IRawConnection): - - conn_ip: str - conn_port: str reader: asyncio.StreamReader writer: asyncio.StreamWriter initiator: bool @@ -16,14 +13,10 @@ class RawConnection(IRawConnection): def __init__( self, - ip: str, - port: str, reader: asyncio.StreamReader, writer: asyncio.StreamWriter, initiator: bool, ) -> None: - self.conn_ip = ip - self.conn_port = port self.reader = reader self.writer = writer self.initiator = initiator diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 3ddc4ab..57fc955 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -204,13 +204,7 @@ class Swarm(INetwork): ) -> None: # Upgrade reader/write to a net_stream and pass \ # to appropriate stream handler (using multiaddr) - raw_conn = RawConnection( - maddr.value_for_protocol("ip4"), - maddr.value_for_protocol("tcp"), - reader, - writer, - False, - ) + raw_conn = RawConnection(reader, writer, False) # Per, https://discuss.libp2p.io/t/multistream-security/130, we first secure # the conn and then mux the conn diff --git a/libp2p/stream_muxer/mplex/mplex.py b/libp2p/stream_muxer/mplex/mplex.py index 8f95124..39ead8a 100644 --- a/libp2p/stream_muxer/mplex/mplex.py +++ b/libp2p/stream_muxer/mplex/mplex.py @@ -3,7 +3,6 @@ from typing import Dict, Optional, Tuple from multiaddr import Multiaddr -from libp2p.network.connection.raw_connection_interface import IRawConnection from libp2p.network.typing import GenericProtocolHandlerFn from libp2p.peer.id import ID from libp2p.security.secure_conn_interface import ISecureConn @@ -24,7 +23,6 @@ class Mplex(IMuxedConn): """ secured_conn: ISecureConn - raw_conn: IRawConnection peer_id: ID # TODO: `dataIn` in go implementation. Should be size of 8. # TODO: Also, `dataIn` is closed indicating EOF in Go. We don't have similar strategies diff --git a/libp2p/transport/tcp/tcp.py b/libp2p/transport/tcp/tcp.py index 6f6d4d9..8e29f9b 100644 --- a/libp2p/transport/tcp/tcp.py +++ b/libp2p/transport/tcp/tcp.py @@ -70,12 +70,12 @@ class TCP(ITransport): :param self_id: peer_id of the dialer (to send to receiver) :return: `RawConnection` if successful """ - host = maddr.value_for_protocol("ip4") - port = maddr.value_for_protocol("tcp") + self.host = maddr.value_for_protocol("ip4") + self.port = int(maddr.value_for_protocol("tcp")) - reader, writer = await asyncio.open_connection(host, int(port)) + reader, writer = await asyncio.open_connection(self.host, self.port) - return RawConnection(host, port, reader, writer, True) + return RawConnection(reader, writer, True) def create_listener(self, handler_function: THandler) -> TCPListener: """