diff --git a/libp2p/host/basic_host.py b/libp2p/host/basic_host.py index 5e83f5ce..d5e5fd19 100644 --- a/libp2p/host/basic_host.py +++ b/libp2p/host/basic_host.py @@ -8,27 +8,15 @@ from typing import ( import multiaddr -from .host_interface import ( - IHost, -) -from libp2p.network.swarm import ( - Swarm -) -from libp2p.peer.id import ( - ID, -) -from libp2p.peer.peerinfo import ( - PeerInfo, -) -from libp2p.peer.peerstore import ( - PeerStore, -) -from libp2p.network.stream.net_stream_interface import ( - INetStream, -) -from libp2p.routing.kademlia.kademlia_peer_router import ( - KadmeliaPeerRouter, -) +from libp2p.network.swarm import Swarm +from libp2p.peer.id import ID +from libp2p.peer.peerinfo import PeerInfo +from libp2p.peer.peerstore import PeerStore + +from libp2p.network.stream.net_stream_interface import INetStream +from libp2p.routing.kademlia.kademlia_peer_router import KadmeliaPeerRouter + +from .host_interface import IHost # Upon host creation, host takes in options, # including the list of addresses on which to listen. diff --git a/libp2p/host/host_interface.py b/libp2p/host/host_interface.py index b14c11db..d158a9b8 100644 --- a/libp2p/host/host_interface.py +++ b/libp2p/host/host_interface.py @@ -9,24 +9,13 @@ from typing import ( import multiaddr -from libp2p.network.swarm import ( - Swarm -) -from libp2p.peer.id import ( - ID, -) -from libp2p.peer.peerinfo import ( - PeerInfo, -) -from libp2p.peer.peerstore import ( - PeerStore, -) -from libp2p.network.stream.net_stream_interface import ( - INetStream, -) -from libp2p.routing.kademlia.kademlia_peer_router import ( - KadmeliaPeerRouter, -) +from libp2p.network.swarm import Swarm +from libp2p.peer.id import ID +from libp2p.peer.peerinfo import PeerInfo +from libp2p.peer.peerstore import PeerStore + +from libp2p.network.stream.net_stream_interface import INetStream +from libp2p.routing.kademlia.kademlia_peer_router import KadmeliaPeerRouter class IHost(ABC): diff --git a/libp2p/network/network_interface.py b/libp2p/network/network_interface.py index 41ab900b..d3dffdea 100644 --- a/libp2p/network/network_interface.py +++ b/libp2p/network/network_interface.py @@ -8,12 +8,11 @@ from typing import ( from multiaddr import Multiaddr +from libp2p.peer.id import ID +from libp2p.stream_muxer.muxed_connection_interface import IMuxedConn + from .notifee_interface import INotifee from .stream.net_stream import NetStream -from libp2p.peer.id import ( - ID, -) -from libp2p.stream_muxer.muxed_connection_interface import IMuxedConn class INetwork(ABC): diff --git a/libp2p/network/notifee_interface.py b/libp2p/network/notifee_interface.py index 168de423..00ca1570 100644 --- a/libp2p/network/notifee_interface.py +++ b/libp2p/network/notifee_interface.py @@ -3,9 +3,10 @@ from abc import ABC, abstractmethod from multiaddr import Multiaddr from libp2p.network.network_interface import INetwork -from libp2p.network.stream.net_stream_interface import INetStream from libp2p.stream_muxer.muxed_connection_interface import IMuxedConn +from libp2p.network.stream.net_stream_interface import INetStream + class INotifee(ABC): diff --git a/libp2p/network/stream/net_stream.py b/libp2p/network/stream/net_stream.py index c1be2e97..237ad732 100644 --- a/libp2p/network/stream/net_stream.py +++ b/libp2p/network/stream/net_stream.py @@ -1,6 +1,7 @@ -from .net_stream_interface import INetStream -from libp2p.stream_muxer.mplex.mplex_stream import MplexStream from libp2p.stream_muxer.mplex.mplex import Mplex +from libp2p.stream_muxer.mplex.mplex_stream import MplexStream + +from .net_stream_interface import INetStream class NetStream(INetStream): diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 50fd6031..e457981a 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -10,10 +10,6 @@ from typing import ( from multiaddr import Multiaddr -from .network_interface import INetwork -from .notifee_interface import INotifee -from .connection.raw_connection import RawConnection -from .stream.net_stream import NetStream from libp2p.peer.id import ( ID, id_b58_decode, @@ -25,9 +21,15 @@ from libp2p.routing.interfaces import IPeerRouting from libp2p.transport.upgrader import TransportUpgrader from libp2p.transport.transport_interface import ITransport from libp2p.transport.listener_interface import IListener -from libp2p.stream_muxer.mplex.mplex_stream import MplexStream from libp2p.stream_muxer.muxed_connection_interface import IMuxedConn +from libp2p.stream_muxer.mplex.mplex_stream import MplexStream + +from .network_interface import INetwork +from .notifee_interface import INotifee +from .connection.raw_connection import RawConnection +from .stream.net_stream import NetStream + class Swarm(INetwork): # pylint: disable=too-many-instance-attributes,cell-var-from-loop,too-many-arguments diff --git a/libp2p/peer/id.py b/libp2p/peer/id.py index 578f67f7..461787ff 100644 --- a/libp2p/peer/id.py +++ b/libp2p/peer/id.py @@ -1,14 +1,14 @@ +import hashlib from typing import ( Union, ) -from Crypto.PublicKey.RSA import ( - RsaKey, -) -import hashlib import base58 + import multihash +from Crypto.PublicKey.RSA import RsaKey + # MaxInlineKeyLength is the maximum length a key can be for it to be inlined in # the peer ID. # * When `len(pubKey.Bytes()) <= MaxInlineKeyLength`, the peer ID is the diff --git a/libp2p/peer/peerstore.py b/libp2p/peer/peerstore.py index 5d32db17..3a594951 100644 --- a/libp2p/peer/peerstore.py +++ b/libp2p/peer/peerstore.py @@ -9,9 +9,9 @@ from typing import ( from multiaddr import Multiaddr from .id import ID -from .peerstore_interface import IPeerStore from .peerdata import PeerData from .peerinfo import PeerInfo +from .peerstore_interface import IPeerStore class PeerStore(IPeerStore): diff --git a/libp2p/peer/peerstore_interface.py b/libp2p/peer/peerstore_interface.py index 01b5b83f..db6dbde5 100644 --- a/libp2p/peer/peerstore_interface.py +++ b/libp2p/peer/peerstore_interface.py @@ -5,9 +5,9 @@ from typing import ( ) +from .addrbook_interface import IAddrBook from .id import ID from .peerinfo import PeerInfo -from .addrbook_interface import IAddrBook from .peermetadata_interface import IPeerMetadata diff --git a/libp2p/pubsub/floodsub.py b/libp2p/pubsub/floodsub.py index c556ef9e..f2eb79f3 100644 --- a/libp2p/pubsub/floodsub.py +++ b/libp2p/pubsub/floodsub.py @@ -12,9 +12,6 @@ from libp2p.peer.id import ( from .pb import rpc_pb2 from .pubsub import Pubsub from .pubsub_router_interface import IPubsubRouter -from libp2p.network.stream.net_stream_interface import ( - INetStream, -) class FloodSub(IPubsubRouter): diff --git a/libp2p/pubsub/gossipsub.py b/libp2p/pubsub/gossipsub.py index d7fe84ad..e4b105ce 100644 --- a/libp2p/pubsub/gossipsub.py +++ b/libp2p/pubsub/gossipsub.py @@ -1,3 +1,4 @@ +from ast import literal_eval import asyncio import random from typing import ( @@ -9,8 +10,6 @@ from typing import ( Sequence, ) -from ast import literal_eval - from libp2p.peer.id import ( ID, id_b58_decode, diff --git a/libp2p/pubsub/pubsub.py b/libp2p/pubsub/pubsub.py index 5887fb4f..f7fab102 100644 --- a/libp2p/pubsub/pubsub.py +++ b/libp2p/pubsub/pubsub.py @@ -10,21 +10,14 @@ from typing import ( from lru import LRU +from libp2p.host.host_interface import IHost +from libp2p.peer.id import ID + +from libp2p.network.stream.net_stream_interface import INetStream from .pb import rpc_pb2 from .pubsub_notifee import PubsubNotifee -from .pubsub_router_interface import ( - IPubsubRouter, -) -from libp2p.host.host_interface import ( - IHost, -) -from libp2p.peer.id import ( - ID, -) -from libp2p.network.stream.net_stream_interface import ( - INetStream, -) +from .pubsub_router_interface import IPubsubRouter def get_msg_id(msg: rpc_pb2.Message) -> Tuple[bytes, bytes]: diff --git a/libp2p/pubsub/pubsub_notifee.py b/libp2p/pubsub/pubsub_notifee.py index bc05f338..880c06dd 100644 --- a/libp2p/pubsub/pubsub_notifee.py +++ b/libp2p/pubsub/pubsub_notifee.py @@ -5,21 +5,12 @@ from typing import ( from multiaddr import Multiaddr -from libp2p.peer.id import ( - ID, -) -from libp2p.stream_muxer.muxed_connection_interface import ( - IMuxedConn, -) -from libp2p.network.notifee_interface import ( - INotifee, -) -from libp2p.network.network_interface import ( - INetwork, -) -from libp2p.network.stream.net_stream_interface import ( - INetStream, -) +from libp2p.peer.id import ID +from libp2p.network.network_interface import INetwork +from libp2p.network.notifee_interface import INotifee +from libp2p.stream_muxer.muxed_connection_interface import IMuxedConn + +from libp2p.network.stream.net_stream_interface import INetStream class PubsubNotifee(INotifee): diff --git a/libp2p/pubsub/pubsub_router_interface.py b/libp2p/pubsub/pubsub_router_interface.py index d644c39f..ce49b4fc 100644 --- a/libp2p/pubsub/pubsub_router_interface.py +++ b/libp2p/pubsub/pubsub_router_interface.py @@ -3,11 +3,10 @@ from typing import ( List, ) +from libp2p.peer.id import ID + from .pb import rpc_pb2 from .pubsub import Pubsub -from libp2p.peer.id import ( - ID, -) class IPubsubRouter(ABC): diff --git a/libp2p/routing/interfaces.py b/libp2p/routing/interfaces.py index 8f3f8414..5f7dfc25 100644 --- a/libp2p/routing/interfaces.py +++ b/libp2p/routing/interfaces.py @@ -5,12 +5,8 @@ from typing import ( Iterable, ) -from libp2p.peer.id import ( - ID, -) -from libp2p.peer.peerinfo import ( - PeerInfo, -) +from libp2p.peer.id import ID +from libp2p.peer.peerinfo import PeerInfo # pylint: disable=too-few-public-methods