From e4bce1cb211c852ff8bf17b40f6e62b7dc3ab455 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Wed, 12 Oct 2022 18:53:14 +0200 Subject: [PATCH] reordered imports to be standardized Signed-off-by: Lorenz Herzberger --- planetmint/backend/connection.py | 9 ++++----- planetmint/backend/schema.py | 2 +- planetmint/backend/tarantool/query.py | 14 ++++++-------- planetmint/backend/tarantool/schema.py | 1 - planetmint/backend/tarantool/transaction/tools.py | 3 ++- planetmint/commands/planetmint.py | 2 +- planetmint/commands/utils.py | 2 +- planetmint/config_utils.py | 2 +- planetmint/core.py | 1 + planetmint/log.py | 4 ---- planetmint/parallel_validation.py | 2 +- planetmint/tendermint_utils.py | 2 -- planetmint/utils.py | 2 +- planetmint/web/server.py | 3 +-- planetmint/web/views/assets.py | 1 - planetmint/web/views/base.py | 1 - planetmint/web/views/blocks.py | 1 - planetmint/web/views/info.py | 2 +- planetmint/web/views/metadata.py | 1 - planetmint/web/views/outputs.py | 1 - planetmint/web/views/transactions.py | 1 - planetmint/web/websocket_dispatcher.py | 1 + planetmint/web/websocket_server.py | 1 - 23 files changed, 22 insertions(+), 37 deletions(-) diff --git a/planetmint/backend/connection.py b/planetmint/backend/connection.py index 2eb7797..febc67e 100644 --- a/planetmint/backend/connection.py +++ b/planetmint/backend/connection.py @@ -3,13 +3,12 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -from itertools import repeat -import logging -from importlib import import_module - import tarantool -from transactions.common.exceptions import ConfigurationError +import logging +from itertools import repeat +from importlib import import_module +from transactions.common.exceptions import ConfigurationError from planetmint.config import Config from planetmint.backend.exceptions import ConnectionError diff --git a/planetmint/backend/schema.py b/planetmint/backend/schema.py index d6492f3..3140b21 100644 --- a/planetmint/backend/schema.py +++ b/planetmint/backend/schema.py @@ -5,9 +5,9 @@ """Database creation and schema-providing interfaces for backends.""" -from functools import singledispatch import logging +from functools import singledispatch from planetmint.config import Config from planetmint.backend.connection import connect from transactions.common.exceptions import ValidationError diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py index d2243f4..588df73 100644 --- a/planetmint/backend/tarantool/query.py +++ b/planetmint/backend/tarantool/query.py @@ -4,18 +4,16 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 """Query implementation for Tarantool""" +import json + from secrets import token_hex from hashlib import sha256 from operator import itemgetter -import json - from tarantool.error import DatabaseError - from planetmint.backend import query from planetmint.backend.utils import module_dispatch_registrar from planetmint.backend.tarantool.connection import TarantoolDBConnection from planetmint.backend.tarantool.transaction.tools import TransactionCompose, TransactionDecompose -from json import dumps, loads register_query = module_dispatch_registrar(query) @@ -325,7 +323,7 @@ def store_unspent_outputs(connection, *unspent_outputs: list): if unspent_outputs: for utxo in unspent_outputs: output = connection.run( - connection.space("utxos").insert((utxo["transaction_id"], utxo["output_index"], dumps(utxo))) + connection.space("utxos").insert((utxo["transaction_id"], utxo["output_index"], json.dumps(utxo))) ) result.append(output) return result @@ -344,7 +342,7 @@ def delete_unspent_outputs(connection, *unspent_outputs: list): @register_query(TarantoolDBConnection) def get_unspent_outputs(connection, query=None): # for now we don't have implementation for 'query'. _utxos = connection.run(connection.space("utxos").select([])) - return [loads(utx[2]) for utx in _utxos] + return [json.loads(utx[2]) for utx in _utxos] @register_query(TarantoolDBConnection) @@ -459,7 +457,7 @@ def get_asset_tokens_for_public_key( @register_query(TarantoolDBConnection) def store_abci_chain(connection, height: int, chain_id: str, is_synced: bool = True): - hash_id_primarykey = sha256(dumps(obj={"height": height}).encode()).hexdigest() + hash_id_primarykey = sha256(json.dumps(obj={"height": height}).encode()).hexdigest() connection.run( connection.space("abci_chains").upsert( (height, is_synced, chain_id, hash_id_primarykey), @@ -471,7 +469,7 @@ def store_abci_chain(connection, height: int, chain_id: str, is_synced: bool = T @register_query(TarantoolDBConnection) def delete_abci_chain(connection, height: int): - hash_id_primarykey = sha256(dumps(obj={"height": height}).encode()).hexdigest() + hash_id_primarykey = sha256(json.dumps(obj={"height": height}).encode()).hexdigest() connection.run(connection.space("abci_chains").delete(hash_id_primarykey), only_data=False) diff --git a/planetmint/backend/tarantool/schema.py b/planetmint/backend/tarantool/schema.py index f4dd7f3..c10c6b2 100644 --- a/planetmint/backend/tarantool/schema.py +++ b/planetmint/backend/tarantool/schema.py @@ -1,6 +1,5 @@ import logging -import tarantool from planetmint.config import Config from planetmint.backend.utils import module_dispatch_registrar from planetmint import backend diff --git a/planetmint/backend/tarantool/transaction/tools.py b/planetmint/backend/tarantool/transaction/tools.py index d5ee75c..f7e96cb 100644 --- a/planetmint/backend/tarantool/transaction/tools.py +++ b/planetmint/backend/tarantool/transaction/tools.py @@ -1,6 +1,7 @@ -from secrets import token_hex import copy import json + +from secrets import token_hex from transactions.common.memoize import HDict diff --git a/planetmint/commands/planetmint.py b/planetmint/commands/planetmint.py index 5064ff6..bb19050 100644 --- a/planetmint/commands/planetmint.py +++ b/planetmint/commands/planetmint.py @@ -12,6 +12,7 @@ import logging import argparse import json import sys +import planetmint from planetmint.core import rollback from planetmint.utils import load_node_key @@ -20,7 +21,6 @@ from transactions.common.exceptions import DatabaseDoesNotExist, ValidationError from transactions.types.elections.vote import Vote from transactions.types.elections.chain_migration_election import ChainMigrationElection from transactions.types.elections.validator_utils import election_id_to_public_key -import planetmint from planetmint import ValidatorElection, Planetmint from planetmint.backend import schema from planetmint.commands import utils diff --git a/planetmint/commands/utils.py b/planetmint/commands/utils.py index 0295120..6c9a9b7 100644 --- a/planetmint/commands/utils.py +++ b/planetmint/commands/utils.py @@ -12,9 +12,9 @@ import builtins import functools import multiprocessing as mp import sys - import planetmint import planetmint.config_utils + from planetmint.version import __version__ diff --git a/planetmint/config_utils.py b/planetmint/config_utils.py index b3bfae3..465c882 100644 --- a/planetmint/config_utils.py +++ b/planetmint/config_utils.py @@ -21,9 +21,9 @@ import copy import json import logging import collections.abc + from functools import lru_cache from pkg_resources import iter_entry_points, ResolutionError - from planetmint.config import Config from transactions.common import exceptions from planetmint.validation import BaseValidationRules diff --git a/planetmint/core.py b/planetmint/core.py index 1398338..5f3496c 100644 --- a/planetmint/core.py +++ b/planetmint/core.py @@ -8,6 +8,7 @@ with Tendermint. """ import logging import sys + from tendermint.abci import types_pb2 from abci.application import BaseApplication from abci.application import OkCode diff --git a/planetmint/log.py b/planetmint/log.py index d24e0ed..07d95f8 100644 --- a/planetmint/log.py +++ b/planetmint/log.py @@ -3,13 +3,9 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -import planetmint -import logging - from transactions.common.exceptions import ConfigurationError from logging.config import dictConfig as set_logging_config from planetmint.config import Config, DEFAULT_LOGGING_CONFIG -import os def _normalize_log_level(level): diff --git a/planetmint/parallel_validation.py b/planetmint/parallel_validation.py index c2f26b2..90534ca 100644 --- a/planetmint/parallel_validation.py +++ b/planetmint/parallel_validation.py @@ -4,8 +4,8 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import multiprocessing as mp -from collections import defaultdict +from collections import defaultdict from planetmint import App from planetmint.lib import Planetmint from planetmint.tendermint_utils import decode_transaction diff --git a/planetmint/tendermint_utils.py b/planetmint/tendermint_utils.py index 9ba754a..28528d7 100644 --- a/planetmint/tendermint_utils.py +++ b/planetmint/tendermint_utils.py @@ -11,9 +11,7 @@ import codecs from binascii import hexlify from tendermint.abci import types_pb2 from tendermint.crypto import keys_pb2 - from hashlib import sha3_256 - from transactions.common.exceptions import InvalidPublicKey diff --git a/planetmint/utils.py b/planetmint/utils.py index 90e41ed..9413132 100644 --- a/planetmint/utils.py +++ b/planetmint/utils.py @@ -8,8 +8,8 @@ import threading import queue import multiprocessing as mp import json - import setproctitle + from packaging import version from planetmint.version import __tm_supported_versions__ from planetmint.tendermint_utils import key_from_base64 diff --git a/planetmint/web/server.py b/planetmint/web/server.py index fd1f2c6..8e86026 100644 --- a/planetmint/web/server.py +++ b/planetmint/web/server.py @@ -10,11 +10,10 @@ The application is implemented in Flask and runs using Gunicorn. import copy import multiprocessing +import gunicorn.app.base from flask import Flask from flask_cors import CORS -import gunicorn.app.base - from planetmint import utils from planetmint import Planetmint from planetmint.web.routes import add_routes diff --git a/planetmint/web/views/assets.py b/planetmint/web/views/assets.py index 14fa52a..f1a04d7 100644 --- a/planetmint/web/views/assets.py +++ b/planetmint/web/views/assets.py @@ -11,7 +11,6 @@ import logging from flask_restful import reqparse, Resource from flask import current_app - from planetmint.backend.exceptions import OperationError from planetmint.web.views.base import make_error diff --git a/planetmint/web/views/base.py b/planetmint/web/views/base.py index cea665f..28b4e9a 100644 --- a/planetmint/web/views/base.py +++ b/planetmint/web/views/base.py @@ -8,7 +8,6 @@ import logging from flask import jsonify, request - from planetmint.config import Config diff --git a/planetmint/web/views/blocks.py b/planetmint/web/views/blocks.py index 07c59aa..0b58514 100644 --- a/planetmint/web/views/blocks.py +++ b/planetmint/web/views/blocks.py @@ -9,7 +9,6 @@ For more information please refer to the documentation: http://planetmint.io/htt """ from flask import current_app from flask_restful import Resource, reqparse - from planetmint.web.views.base import make_error diff --git a/planetmint/web/views/info.py b/planetmint/web/views/info.py index e2bcfa4..9f39bb2 100644 --- a/planetmint/web/views/info.py +++ b/planetmint/web/views/info.py @@ -6,8 +6,8 @@ """API Index endpoint""" import flask -from flask_restful import Resource +from flask_restful import Resource from planetmint.web.views.base import base_ws_uri from planetmint import version from planetmint.web.websocket_server import EVENTS_ENDPOINT, EVENTS_ENDPOINT_BLOCKS diff --git a/planetmint/web/views/metadata.py b/planetmint/web/views/metadata.py index c122f55..b6bdeed 100644 --- a/planetmint/web/views/metadata.py +++ b/planetmint/web/views/metadata.py @@ -11,7 +11,6 @@ import logging from flask_restful import reqparse, Resource from flask import current_app - from planetmint.backend.exceptions import OperationError from planetmint.web.views.base import make_error diff --git a/planetmint/web/views/outputs.py b/planetmint/web/views/outputs.py index 1e2c342..9b4992c 100644 --- a/planetmint/web/views/outputs.py +++ b/planetmint/web/views/outputs.py @@ -5,7 +5,6 @@ from flask import current_app from flask_restful import reqparse, Resource - from planetmint.web.views import parameters diff --git a/planetmint/web/views/transactions.py b/planetmint/web/views/transactions.py index 6b67247..4b5e8ac 100644 --- a/planetmint/web/views/transactions.py +++ b/planetmint/web/views/transactions.py @@ -11,7 +11,6 @@ import logging from flask import current_app, request, jsonify from flask_restful import Resource, reqparse - from transactions.common.transaction_mode_types import BROADCAST_TX_ASYNC from transactions.common.exceptions import ( SchemaValidationError, diff --git a/planetmint/web/websocket_dispatcher.py b/planetmint/web/websocket_dispatcher.py index 65e9940..3f423f1 100644 --- a/planetmint/web/websocket_dispatcher.py +++ b/planetmint/web/websocket_dispatcher.py @@ -5,6 +5,7 @@ import json + from planetmint.events import EventTypes from planetmint.events import POISON_PILL diff --git a/planetmint/web/websocket_server.py b/planetmint/web/websocket_server.py index 3e09a59..0aceff8 100644 --- a/planetmint/web/websocket_server.py +++ b/planetmint/web/websocket_server.py @@ -21,7 +21,6 @@ import logging import threading import aiohttp - from uuid import uuid4 from concurrent.futures import CancelledError from planetmint.config import Config