run lint and fix errors, except mypy

This commit is contained in:
pacrob
2024-02-19 15:56:20 -07:00
parent 42605c0288
commit 94483714a3
171 changed files with 4809 additions and 2290 deletions

View File

@ -1,4 +1,6 @@
from libp2p.exceptions import BaseLibp2pError
from libp2p.exceptions import (
BaseLibp2pError,
)
class OpenConnectionError(BaseLibp2pError):

View File

@ -1,7 +1,14 @@
from abc import ABC, abstractmethod
from typing import Tuple
from abc import (
ABC,
abstractmethod,
)
from typing import (
Tuple,
)
from multiaddr import Multiaddr
from multiaddr import (
Multiaddr,
)
import trio
@ -9,7 +16,7 @@ class IListener(ABC):
@abstractmethod
async def listen(self, maddr: Multiaddr, nursery: trio.Nursery) -> bool:
"""
put listener in listening mode and wait for incoming connections.
Put listener in listening mode and wait for incoming connections.
:param maddr: multiaddr of peer
:return: return True if successful
@ -18,7 +25,7 @@ class IListener(ABC):
@abstractmethod
def get_addrs(self) -> Tuple[Multiaddr, ...]:
"""
retrieve list of addresses the listener is listening on.
Retrieve list of addresses the listener is listening on.
:return: return list of addrs
"""

View File

@ -1,17 +1,41 @@
import logging
from typing import Awaitable, Callable, List, Sequence, Tuple
from typing import (
Awaitable,
Callable,
List,
Sequence,
Tuple,
)
from multiaddr import Multiaddr
from multiaddr import (
Multiaddr,
)
import trio
from trio_typing import TaskStatus
from trio_typing import (
TaskStatus,
)
from libp2p.io.trio import TrioTCPStream
from libp2p.network.connection.raw_connection import RawConnection
from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.transport.exceptions import OpenConnectionError
from libp2p.transport.listener_interface import IListener
from libp2p.transport.transport_interface import ITransport
from libp2p.transport.typing import THandler
from libp2p.io.trio import (
TrioTCPStream,
)
from libp2p.network.connection.raw_connection import (
RawConnection,
)
from libp2p.network.connection.raw_connection_interface import (
IRawConnection,
)
from libp2p.transport.exceptions import (
OpenConnectionError,
)
from libp2p.transport.listener_interface import (
IListener,
)
from libp2p.transport.transport_interface import (
ITransport,
)
from libp2p.transport.typing import (
THandler,
)
logger = logging.getLogger("libp2p.transport.tcp")
@ -26,7 +50,7 @@ class TCPListener(IListener):
# TODO: Get rid of `nursery`?
async def listen(self, maddr: Multiaddr, nursery: trio.Nursery) -> None:
"""
put listener in listening mode and wait for incoming connections.
Put listener in listening mode and wait for incoming connections.
:param maddr: maddr of peer
:return: return True if successful
@ -56,7 +80,7 @@ class TCPListener(IListener):
def get_addrs(self) -> Tuple[Multiaddr, ...]:
"""
retrieve list of addresses the listener is listening on.
Retrieve list of addresses the listener is listening on.
:return: return list of addrs
"""
@ -73,7 +97,7 @@ class TCPListener(IListener):
class TCP(ITransport):
async def dial(self, maddr: Multiaddr) -> IRawConnection:
"""
dial a transport to peer listening on multiaddr.
Dial a transport to peer listening on multiaddr.
:param maddr: multiaddr of peer
:return: `RawConnection` if successful
@ -92,7 +116,7 @@ class TCP(ITransport):
def create_listener(self, handler_function: THandler) -> TCPListener:
"""
create listener on transport.
Create listener on transport.
:param handler_function: a function called when a new connection is received
that takes a connection as argument which implements interface-connection

View File

@ -1,18 +1,29 @@
from abc import ABC, abstractmethod
from abc import (
ABC,
abstractmethod,
)
from multiaddr import Multiaddr
from multiaddr import (
Multiaddr,
)
from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.network.connection.raw_connection_interface import (
IRawConnection,
)
from .listener_interface import IListener
from .typing import THandler
from .listener_interface import (
IListener,
)
from .typing import (
THandler,
)
class ITransport(ABC):
@abstractmethod
async def dial(self, maddr: Multiaddr) -> IRawConnection:
"""
dial a transport to peer listening on multiaddr.
Dial a transport to peer listening on multiaddr.
:param multiaddr: multiaddr of peer
:param self_id: peer_id of the dialer (to send to receiver)
@ -22,7 +33,7 @@ class ITransport(ABC):
@abstractmethod
def create_listener(self, handler_function: THandler) -> IListener:
"""
create listener on transport.
Create listener on transport.
:param handler_function: a function called when a new conntion is received
that takes a connection as argument which implements interface-connection

View File

@ -1,9 +1,22 @@
from typing import Awaitable, Callable, Mapping, Type
from typing import (
Awaitable,
Callable,
Mapping,
Type,
)
from libp2p.io.abc import ReadWriteCloser
from libp2p.security.secure_transport_interface import ISecureTransport
from libp2p.stream_muxer.abc import IMuxedConn
from libp2p.typing import TProtocol
from libp2p.io.abc import (
ReadWriteCloser,
)
from libp2p.security.secure_transport_interface import (
ISecureTransport,
)
from libp2p.stream_muxer.abc import (
IMuxedConn,
)
from libp2p.typing import (
TProtocol,
)
THandler = Callable[[ReadWriteCloser], Awaitable[None]]
TSecurityOptions = Mapping[TProtocol, ISecureTransport]

View File

@ -1,16 +1,43 @@
from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.peer.id import ID
from libp2p.protocol_muxer.exceptions import MultiselectClientError, MultiselectError
from libp2p.security.exceptions import HandshakeFailure
from libp2p.security.secure_conn_interface import ISecureConn
from libp2p.security.security_multistream import SecurityMultistream
from libp2p.stream_muxer.abc import IMuxedConn
from libp2p.stream_muxer.muxer_multistream import MuxerMultistream
from libp2p.transport.exceptions import MuxerUpgradeFailure, SecurityUpgradeFailure
from libp2p.transport.typing import TMuxerOptions, TSecurityOptions
from libp2p.network.connection.raw_connection_interface import (
IRawConnection,
)
from libp2p.peer.id import (
ID,
)
from libp2p.protocol_muxer.exceptions import (
MultiselectClientError,
MultiselectError,
)
from libp2p.security.exceptions import (
HandshakeFailure,
)
from libp2p.security.secure_conn_interface import (
ISecureConn,
)
from libp2p.security.security_multistream import (
SecurityMultistream,
)
from libp2p.stream_muxer.abc import (
IMuxedConn,
)
from libp2p.stream_muxer.muxer_multistream import (
MuxerMultistream,
)
from libp2p.transport.exceptions import (
MuxerUpgradeFailure,
SecurityUpgradeFailure,
)
from libp2p.transport.typing import (
TMuxerOptions,
TSecurityOptions,
)
from .listener_interface import IListener
from .transport_interface import ITransport
from .listener_interface import (
IListener,
)
from .transport_interface import (
ITransport,
)
class TransportUpgrader:
@ -28,7 +55,6 @@ class TransportUpgrader:
def upgrade_listener(self, transport: ITransport, listeners: IListener) -> None:
"""Upgrade multiaddr listeners to libp2p-transport listeners."""
# TODO: Figure out what to do with this function.
pass
async def upgrade_security(
self, raw_conn: IRawConnection, peer_id: ID, is_initiator: bool