Improve import layout

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):

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,

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]:

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):

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):