tests, isort, black

hivemind/dht/dht.py

@@ -8,10 +8,10 @@
 from typing import Awaitable, Callable, Iterable, List, Optional, Sequence, TypeVar, Union
 
 from hivemind.dht.node import DEFAULT_NUM_WORKERS, DHTNode
-from hivemind.p2p.multiaddr import Multiaddr
 from hivemind.dht.routing import DHTKey, DHTValue, Subkey
 from hivemind.dht.validation import CompositeValidator, RecordValidatorBase
 from hivemind.p2p import P2P, PeerID
+from hivemind.p2p.multiaddr import Multiaddr
 from hivemind.utils import MPFuture, get_logger, switch_to_uvloop
 from hivemind.utils.timed_storage import DHTExpiration, ValueWithExpiration
 

hivemind/p2p/multiaddr/codecs/__init__.py

@@ -1,6 +1,5 @@
 import importlib
 
-
 # These are special sizes
 LENGTH_PREFIXED_VAR_SIZE = -1
 

hivemind/p2p/multiaddr/codecs/cid.py

@@ -3,7 +3,6 @@
 
 from . import LENGTH_PREFIXED_VAR_SIZE
 
-
 SIZE = LENGTH_PREFIXED_VAR_SIZE
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/domain.py

@@ -2,7 +2,6 @@
 
 from . import LENGTH_PREFIXED_VAR_SIZE
 
-
 SIZE = LENGTH_PREFIXED_VAR_SIZE
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/fspath.py

@@ -2,7 +2,6 @@
 
 from . import LENGTH_PREFIXED_VAR_SIZE
 
-
 SIZE = LENGTH_PREFIXED_VAR_SIZE
 IS_PATH = True
 

hivemind/p2p/multiaddr/codecs/ip4.py

@@ -1,6 +1,5 @@
 import netaddr
 
-
 SIZE = 32
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/ip6.py

@@ -1,6 +1,5 @@
 import netaddr
 
-
 SIZE = 128
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/onion.py

@@ -1,7 +1,6 @@
 import base64
 import struct
 
-
 SIZE = 96
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/onion3.py

@@ -1,7 +1,6 @@
 import base64
 import struct
 
-
 SIZE = 296
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/uint16be.py

@@ -1,6 +1,5 @@
 import struct
 
-
 SIZE = 16
 IS_PATH = False
 

hivemind/p2p/multiaddr/codecs/utf8.py

@@ -2,7 +2,6 @@
 
 from . import LENGTH_PREFIXED_VAR_SIZE
 
-
 SIZE = LENGTH_PREFIXED_VAR_SIZE
 IS_PATH = False
 

hivemind/p2p/multiaddr/multiaddr.py

@@ -3,11 +3,7 @@
 import varint
 
 from . import exceptions, protocols
-
-from .transforms import bytes_iter
-from .transforms import string_to_bytes
-from .transforms import bytes_to_string
-
+from .transforms import bytes_iter, bytes_to_string, string_to_bytes
 
 __all__ = ("Multiaddr",)
 

hivemind/p2p/multiaddr/transforms.py

@@ -1,13 +1,10 @@
 import io
+
 import varint
 
 from . import exceptions
-
-from .codecs import LENGTH_PREFIXED_VAR_SIZE
-from .codecs import codec_by_name
-
-from .protocols import protocol_with_code
-from .protocols import protocol_with_name
+from .codecs import LENGTH_PREFIXED_VAR_SIZE, codec_by_name
+from .protocols import protocol_with_code, protocol_with_name
 
 
 def string_to_bytes(string):

hivemind/p2p/p2p_daemon.py

@@ -15,10 +15,10 @@
 
 import hivemind.hivemind_cli as cli
 import hivemind.p2p.p2p_daemon_bindings.p2pclient as p2pclient
+from hivemind.p2p.multiaddr import Multiaddr
 from hivemind.p2p.p2p_daemon_bindings.control import DEFAULT_MAX_MSG_SIZE, P2PDaemonError, P2PHandlerError
 from hivemind.p2p.p2p_daemon_bindings.datastructures import PeerID, PeerInfo, StreamInfo
 from hivemind.p2p.p2p_daemon_bindings.utils import ControlFailure
-from hivemind.p2p.multiaddr import Multiaddr
 from hivemind.proto import crypto_pb2
 from hivemind.proto.p2pd_pb2 import RPCError
 from hivemind.utils.asyncio import as_aiter, asingle

hivemind/p2p/p2p_daemon_bindings/control.py

@@ -9,8 +9,8 @@
 from typing import AsyncIterator, Awaitable, Callable, Dict, Iterable, Optional, Sequence, Tuple
 from uuid import UUID, uuid4
 
-from hivemind.p2p.p2p_daemon_bindings.datastructures import PeerID, PeerInfo, StreamInfo
 from hivemind.p2p.multiaddr import Multiaddr, protocols
+from hivemind.p2p.p2p_daemon_bindings.datastructures import PeerID, PeerInfo, StreamInfo
 from hivemind.p2p.p2p_daemon_bindings.utils import (
     DispatchFailure,
     P2PDaemonError,

hivemind/p2p/p2p_daemon_bindings/datastructures.py

@@ -11,8 +11,8 @@
 import multihash
 from cryptography.hazmat.primitives import serialization
 
-from hivemind.proto import crypto_pb2, p2pd_pb2
 from hivemind.p2p.multiaddr import Multiaddr, protocols
+from hivemind.proto import crypto_pb2, p2pd_pb2
 
 
 class PeerID:

hivemind/p2p/p2p_daemon_bindings/p2pclient.py

@@ -8,7 +8,6 @@
 from contextlib import asynccontextmanager
 from typing import AsyncIterator, Iterable, Sequence, Tuple
 
-
 from hivemind.p2p.multiaddr import Multiaddr
 from hivemind.p2p.p2p_daemon_bindings.control import (
     DEFAULT_MAX_MSG_SIZE,

hivemind/utils/networking.py

@@ -1,8 +1,8 @@
 from ipaddress import ip_address
 from typing import List, Sequence
 
-from hivemind.utils.logging import TextStyle, get_logger
 from hivemind.p2p.multiaddr import Multiaddr
+from hivemind.utils.logging import TextStyle, get_logger
 
 LOCALHOST = "127.0.0.1"
 

tests/test_dht.py

@@ -6,12 +6,11 @@
 import pytest
 
 import hivemind
+from hivemind.p2p.multiaddr import Multiaddr
 
 from test_utils.dht_swarms import launch_dht_instances
 from test_utils.networking import get_free_port
 
-from hivemind.p2p.multiaddr import Multiaddr
-
 
 @pytest.mark.asyncio
 async def test_startup_error():