Format imports with isort in makefile (#84)

Makefile

@@ -14,6 +14,7 @@ codeformat:
 #	tox -e black
 	tox -e autoflake
 	tox -e autopep8
+	tox -e isort
 
 itest:
 	./itests/run_itest.sh

itests/test.py

@@ -4,25 +4,16 @@ import logging
 import time
 
 import grpc
-
+from lnd_lightning_client import LNDLightningClient
+from squeak.core import HASH_LENGTH, CheckSqueak, CSqueak, MakeSqueakFromStr
+from squeak.core.encryption import CEncryptedDecryptionKey, generate_data_key
+from squeak.core.signing import CSigningKey, CSqueakAddress
 from squeak.params import SelectParams
-from squeak.core import CSqueak
-from squeak.core import CheckSqueak
-from squeak.core import HASH_LENGTH
-from squeak.core import MakeSqueakFromStr
-from squeak.core.encryption import CEncryptedDecryptionKey
-from squeak.core.encryption import generate_data_key
-from squeak.core.signing import CSigningKey
-from squeak.core.signing import CSqueakAddress
 
 from proto import lnd_pb2 as ln
 from proto import lnd_pb2_grpc as lnrpc
-from proto import squeak_server_pb2
-from proto import squeak_server_pb2_grpc
-from proto import squeak_admin_pb2
-from proto import squeak_admin_pb2_grpc
-
-from lnd_lightning_client import LNDLightningClient
+from proto import (squeak_admin_pb2, squeak_admin_pb2_grpc, squeak_server_pb2,
+                   squeak_server_pb2_grpc)
 
 
 def build_squeak_msg(squeak):

itests/util.py

@@ -1,9 +1,7 @@
 import time
 
-
 from bitcoin.core import lx
-from squeak.core import HASH_LENGTH
-from squeak.core import MakeSqueakFromStr
+from squeak.core import HASH_LENGTH, MakeSqueakFromStr
 from squeak.core.signing import CSigningKey
 
 

setup.py

@@ -1,7 +1,6 @@
 import io
 
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
 
 with io.open("README.md", "rt", encoding="utf8") as f:
     readme = f.read()

squeakserver/admin/squeak_admin_server_handler.py

@@ -1,10 +1,8 @@
 import logging
 
-
 from squeakserver.common.lnd_lightning_client import LNDLightningClient
 from squeakserver.node.squeak_node import SqueakNode
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/admin/squeak_admin_server_servicer.py

@@ -3,10 +3,7 @@ from concurrent import futures
 
 import grpc
 
-
-from proto import squeak_admin_pb2
-from proto import squeak_admin_pb2_grpc
-
+from proto import squeak_admin_pb2, squeak_admin_pb2_grpc
 
 logger = logging.getLogger(__name__)
 

squeakserver/common/blockchain_client.py

@@ -1,5 +1,4 @@
-from abc import ABC
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 from typing import Optional
 
 

squeakserver/node/block_info.py

@@ -1,4 +1,3 @@
 from collections import namedtuple
 
-
 BlockInfo = namedtuple('BlockInfo', 'block_hash, block_height')

squeakserver/node/squeak_block_periodic_worker.py

@@ -1,7 +1,6 @@
 import logging
 import threading
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/node/squeak_block_queue_worker.py

@@ -1,7 +1,6 @@
 import logging
 import threading
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/node/squeak_block_verifier.py

@@ -1,7 +1,6 @@
 import logging
 import queue
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/node/squeak_maker.py

@@ -1,12 +1,11 @@
 import logging
 import time
 
-from squeak.core.signing import CSigningKey
 from squeak.core import MakeSqueakFromStr
+from squeak.core.signing import CSigningKey
 
 from squeakserver.node.block_info import BlockInfo
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/node/squeak_node.py

@@ -1,15 +1,15 @@
-from squeak.core.signing import CSigningKey
-from squeak.core.signing import CSqueakAddress
-from squeak.core.encryption import generate_initialization_vector
-from squeak.core.encryption import CEncryptedDecryptionKey
+from squeak.core.encryption import (CEncryptedDecryptionKey,
+                                    generate_initialization_vector)
+from squeak.core.signing import CSigningKey, CSqueakAddress
 
-from squeakserver.node.squeak_block_verifier import SqueakBlockVerifier
-from squeakserver.node.squeak_block_periodic_worker import SqueakBlockPeriodicWorker
+from squeakserver.node.squeak_block_periodic_worker import \
+    SqueakBlockPeriodicWorker
 from squeakserver.node.squeak_block_queue_worker import SqueakBlockQueueWorker
+from squeakserver.node.squeak_block_verifier import SqueakBlockVerifier
 from squeakserver.node.squeak_maker import SqueakMaker
 from squeakserver.server.buy_offer import BuyOffer
-from squeakserver.server.util import generate_offer_preimage
 from squeakserver.server.squeak_profile import SqueakProfile
+from squeakserver.server.util import generate_offer_preimage
 
 
 class SqueakNode:

squeakserver/server/lightning_address.py

@@ -1,4 +1,3 @@
 from collections import namedtuple
 
-
 LightningAddressHostPort = namedtuple('LightningAddress', ['host', 'port'])

squeakserver/server/main.py

@@ -2,25 +2,25 @@ import argparse
 import logging
 import sys
 import threading
-
 from configparser import ConfigParser
 
 from squeak.params import SelectParams
 
 import proto.lnd_pb2 as ln
 import proto.lnd_pb2_grpc as lnrpc
-
-from squeakserver.admin.squeak_admin_server_servicer import SqueakAdminServerServicer
-from squeakserver.admin.squeak_admin_server_handler import SqueakAdminServerHandler
+from squeakserver.admin.squeak_admin_server_handler import \
+    SqueakAdminServerHandler
+from squeakserver.admin.squeak_admin_server_servicer import \
+    SqueakAdminServerServicer
+from squeakserver.blockchain.bitcoin_blockchain_client import \
+    BitcoinBlockchainClient
 from squeakserver.common.lnd_lightning_client import LNDLightningClient
-from squeakserver.server.lightning_address import LightningAddressHostPort
-from squeakserver.server.squeak_server_servicer import SqueakServerServicer
-from squeakserver.server.squeak_server_handler import SqueakServerHandler
-from squeakserver.server.db_params import parse_db_params
-from squeakserver.server.postgres_db import PostgresDb
-from squeakserver.blockchain.bitcoin_blockchain_client import BitcoinBlockchainClient
 from squeakserver.node.squeak_node import SqueakNode
-
+from squeakserver.server.db_params import parse_db_params
+from squeakserver.server.lightning_address import LightningAddressHostPort
+from squeakserver.server.postgres_db import PostgresDb
+from squeakserver.server.squeak_server_handler import SqueakServerHandler
+from squeakserver.server.squeak_server_servicer import SqueakServerServicer
 
 logger = logging.getLogger(__name__)
 

squeakserver/server/postgres_db.py

@@ -1,15 +1,11 @@
 import logging
-
 from contextlib import contextmanager
 
 from psycopg2 import pool
-
 from squeak.core import CSqueak
 
-from squeakserver.server.util import get_hash
-
 from squeakserver.server.squeak_profile import SqueakProfile
-
+from squeakserver.server.util import get_hash
 
 logger = logging.getLogger(__name__)
 

squeakserver/server/squeak_profile.py

@@ -1,5 +1,4 @@
 from collections import namedtuple
 
-
 SqueakProfile = namedtuple(
     'SqueakProfile', 'profile_id, profile_name, private_key, address, sharing, following')

squeakserver/server/squeak_server_handler.py

@@ -1,9 +1,7 @@
 import logging
 
-
-from squeakserver.server.util import get_hash
 from squeakserver.node.squeak_node import SqueakNode
-
+from squeakserver.server.util import get_hash
 
 logger = logging.getLogger(__name__)
 

squeakserver/server/squeak_server_servicer.py

@@ -2,15 +2,11 @@ import logging
 from concurrent import futures
 
 import grpc
-
 from squeak.core import CSqueak
 
-from proto import squeak_server_pb2
-from proto import squeak_server_pb2_grpc
-
+from proto import squeak_server_pb2, squeak_server_pb2_grpc
 from squeakserver.server.util import get_hash
 
-
 logger = logging.getLogger(__name__)
 
 

squeakserver/server/squeak_validator.py

@@ -1,9 +1,6 @@
 import logging
 
-from squeak.core import CheckSqueak
-from squeak.core import CheckSqueakError
-from squeak.core import CSqueak
-
+from squeak.core import CheckSqueak, CheckSqueakError, CSqueak
 
 logger = logging.getLogger(__name__)
 

squeakserver/server/util.py

@@ -1,6 +1,5 @@
 import os
 
-
 DATA_KEY_LENGTH = 32
 
 

tests/server/conftest.py

@@ -1,10 +1,8 @@
 import time
 
 import pytest
-
 from bitcoin.core import lx
-from squeak.core import HASH_LENGTH
-from squeak.core import MakeSqueakFromStr
+from squeak.core import HASH_LENGTH, MakeSqueakFromStr
 from squeak.core.signing import CSigningKey
 
 from squeakserver.server.squeak_validator import SqueakValidator

tox.ini

@@ -62,4 +62,11 @@ basepython = python3.8
 deps =
      autoflake
 commands =
-     autoflake --in-place --recursive --remove-all-unused-imports .
+     autoflake --in-place --recursive --remove-all-unused-imports .
+
+[testenv:isort]
+basepython = python3.8
+deps =
+     isort
+commands =
+     isort .