diff --git a/tests/assets/test_digital_assets.py b/tests/assets/test_digital_assets.py index 9a37283..d202195 100644 --- a/tests/assets/test_digital_assets.py +++ b/tests/assets/test_digital_assets.py @@ -4,6 +4,7 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import pytest + from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer diff --git a/tests/assets/test_divisible_assets.py b/tests/assets/test_divisible_assets.py index f6718cd..5bd9978 100644 --- a/tests/assets/test_divisible_assets.py +++ b/tests/assets/test_divisible_assets.py @@ -5,7 +5,6 @@ import pytest -import random from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer diff --git a/tests/assets/test_zenroom_signing.py b/tests/assets/test_zenroom_signing.py index eeebe64..922ba88 100644 --- a/tests/assets/test_zenroom_signing.py +++ b/tests/assets/test_zenroom_signing.py @@ -1,5 +1,6 @@ import json import base58 + from hashlib import sha3_256 from zenroom import zencode_exec from cryptoconditions.types.zenroom import ZenroomSha256 diff --git a/tests/backend/test_utils.py b/tests/backend/test_utils.py index 7786165..0f62982 100644 --- a/tests/backend/test_utils.py +++ b/tests/backend/test_utils.py @@ -3,11 +3,11 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 +import pytest + from functools import singledispatch from types import ModuleType -import pytest - @pytest.fixture def mock_module(): diff --git a/tests/commands/conftest.py b/tests/commands/conftest.py index 2fd8028..3552b6e 100644 --- a/tests/commands/conftest.py +++ b/tests/commands/conftest.py @@ -3,9 +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 -from argparse import Namespace import pytest +from argparse import Namespace from planetmint.config import Config diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index 4b9e3df..87dbe70 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -5,18 +5,15 @@ import json import logging +import pytest from unittest.mock import Mock, patch from argparse import Namespace - -import pytest - from planetmint.config import Config from planetmint import ValidatorElection from planetmint.commands.planetmint import run_election_show from planetmint.lib import Block from transactions.types.elections.chain_migration_election import ChainMigrationElection - from tests.utils import generate_election, generate_validators diff --git a/tests/commands/test_utils.py b/tests/commands/test_utils.py index a731f66..f1e208a 100644 --- a/tests/commands/test_utils.py +++ b/tests/commands/test_utils.py @@ -4,10 +4,10 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import argparse -from argparse import Namespace import logging - import pytest + +from argparse import Namespace from planetmint.config import Config from unittest.mock import patch diff --git a/tests/conftest.py b/tests/conftest.py index 5837bfa..b9acaa0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,17 +14,14 @@ import os import random import tempfile import codecs +import pytest + from ipld import marshal, multihash from collections import namedtuple from logging import getLogger from logging.config import dictConfig from planetmint.backend.connection import connect from planetmint.backend.tarantool.connection import TarantoolDBConnection - -import pytest - -# from pymongo import MongoClient - from transactions.common import crypto from transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT from planetmint.tendermint_utils import key_from_base64 @@ -35,7 +32,6 @@ from planetmint.lib import Block from tests.utils import gen_vote from planetmint.config import Config from transactions.types.elections.validator_election import ValidatorElection # noqa - from tendermint.abci import types_pb2 as types from tendermint.crypto import keys_pb2 diff --git a/tests/db/test_planetmint_api.py b/tests/db/test_planetmint_api.py index 6c67e15..8f32206 100644 --- a/tests/db/test_planetmint_api.py +++ b/tests/db/test_planetmint_api.py @@ -3,13 +3,15 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 import warnings +import random +import pytest + from unittest.mock import patch from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer from ipld import marshal, multihash -import pytest from base58 import b58decode -import random + pytestmark = pytest.mark.bdb diff --git a/tests/elections/test_election.py b/tests/elections/test_election.py index 63626e3..d0461e4 100644 --- a/tests/elections/test_election.py +++ b/tests/elections/test_election.py @@ -1,7 +1,6 @@ import pytest from tests.utils import generate_election, generate_validators - from planetmint.lib import Block from transactions.types.elections.election import Election from transactions.types.elections.chain_migration_election import ChainMigrationElection diff --git a/tests/tendermint/test_core.py b/tests/tendermint/test_core.py index caa6c6a..7268734 100644 --- a/tests/tendermint/test_core.py +++ b/tests/tendermint/test_core.py @@ -8,13 +8,13 @@ import random import multiprocessing as mp import pytest + from tendermint.abci import types_pb2 as types from tendermint.crypto import keys_pb2 from transactions import ValidatorElection, ChainMigrationElection from transactions.common.crypto import generate_key_pair from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer - from planetmint import App from planetmint.backend import query from planetmint.core import OkCode, CodeTypeError, rollback @@ -22,7 +22,6 @@ from planetmint.lib import Block from planetmint.tendermint_utils import new_validator_set from planetmint.tendermint_utils import public_key_to_base64 from planetmint.version import __tm_supported_versions__ - from tests.utils import generate_election, generate_validators pytestmark = pytest.mark.bdb diff --git a/tests/tendermint/test_integration.py b/tests/tendermint/test_integration.py index 77f2f2f..c5b5fc0 100644 --- a/tests/tendermint/test_integration.py +++ b/tests/tendermint/test_integration.py @@ -4,17 +4,14 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import codecs -from transactions.types.assets.create import Create -from transactions.types.assets.transfer import Transfer - -from tendermint.abci import types_pb2 as types import json import pytest - +from transactions.types.assets.create import Create +from transactions.types.assets.transfer import Transfer +from tendermint.abci import types_pb2 as types from abci.server import ProtocolHandler from abci.utils import read_messages - from transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT, BROADCAST_TX_SYNC from planetmint.version import __tm_supported_versions__ from io import BytesIO diff --git a/tests/tendermint/test_lib.py b/tests/tendermint/test_lib.py index 298f1ad..4a2338a 100644 --- a/tests/tendermint/test_lib.py +++ b/tests/tendermint/test_lib.py @@ -3,17 +3,16 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -from operator import index + import os +import pytest + from unittest.mock import patch from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer - +from operator import index from hashlib import sha3_256 - -import pytest from pymongo import MongoClient - from planetmint import backend from transactions.common.transaction_mode_types import ( BROADCAST_TX_COMMIT, diff --git a/tests/tendermint/test_utils.py b/tests/tendermint/test_utils.py index c6cfd45..d393685 100644 --- a/tests/tendermint/test_utils.py +++ b/tests/tendermint/test_utils.py @@ -5,8 +5,8 @@ import base64 import json -from pytest import mark +from pytest import mark from hashlib import sha3_256 diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py index 406e46c..f537830 100644 --- a/tests/test_config_utils.py +++ b/tests/test_config_utils.py @@ -3,12 +3,10 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -import copy -from unittest.mock import mock_open, patch - import pytest - import planetmint + +from unittest.mock import mock_open, patch from planetmint.config import Config diff --git a/tests/test_core.py b/tests/test_core.py index 6d43cc6..0de8c5b 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -4,6 +4,7 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import pytest + from planetmint.version import __tm_supported_versions__ from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer diff --git a/tests/test_docs.py b/tests/test_docs.py index 40dd90f..b05c8cb 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py @@ -3,9 +3,7 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 - import subprocess -import os def test_build_root_docs(): diff --git a/tests/test_utils.py b/tests/test_utils.py index 68cbacb..3e3979f 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -4,10 +4,10 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import queue -from unittest.mock import patch, call - import pytest +from unittest.mock import patch, call + @pytest.fixture def mock_queue(monkeypatch): diff --git a/tests/upsert_validator/conftest.py b/tests/upsert_validator/conftest.py index 9bfafa3..4946bc3 100644 --- a/tests/upsert_validator/conftest.py +++ b/tests/upsert_validator/conftest.py @@ -2,10 +2,10 @@ # Planetmint and IPDB software contributors. # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -from unittest.mock import patch import pytest +from unittest.mock import patch from planetmint.backend import query from transactions.types.elections.validator_election import ValidatorElection diff --git a/tests/upsert_validator/test_validator_election.py b/tests/upsert_validator/test_validator_election.py index 6c9b39a..31a9fc3 100644 --- a/tests/upsert_validator/test_validator_election.py +++ b/tests/upsert_validator/test_validator_election.py @@ -2,11 +2,11 @@ # Planetmint and IPDB software contributors. # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -from argparse import Namespace -from unittest.mock import patch import pytest +from argparse import Namespace +from unittest.mock import patch from planetmint.tendermint_utils import public_key_to_base64 from transactions.types.elections.validator_election import ValidatorElection from transactions.common.exceptions import ( diff --git a/tests/utils.py b/tests/utils.py index 5d2a47b..d1fa756 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -8,7 +8,6 @@ import base64 import random from functools import singledispatch - from planetmint.backend.localmongodb.connection import LocalMongoDBConnection from planetmint.backend.tarantool.connection import TarantoolDBConnection from planetmint.backend.schema import TABLES, SPACE_NAMES diff --git a/tests/validation/test_transaction_structure.py b/tests/validation/test_transaction_structure.py index 0efb4e4..6817c75 100644 --- a/tests/validation/test_transaction_structure.py +++ b/tests/validation/test_transaction_structure.py @@ -8,12 +8,10 @@ structural / schematic issues are caught when reading a transaction (ie going from dict -> transaction). """ import json - import pytest - import hashlib as sha3 -from unittest.mock import MagicMock +from unittest.mock import MagicMock from transactions.common.exceptions import AmountError, SchemaValidationError, ThresholdTooDeep from transactions.common.transaction import Transaction from transactions.common.utils import _fulfillment_to_details, _fulfillment_from_details diff --git a/tests/web/test_assets.py b/tests/web/test_assets.py index 5e0760c..93a7598 100644 --- a/tests/web/test_assets.py +++ b/tests/web/test_assets.py @@ -4,6 +4,7 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import pytest + from transactions.types.assets.create import Create from ipld import marshal, multihash diff --git a/tests/web/test_metadata.py b/tests/web/test_metadata.py index 302b301..8c79f49 100644 --- a/tests/web/test_metadata.py +++ b/tests/web/test_metadata.py @@ -4,6 +4,7 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import pytest + from transactions.types.assets.create import Create from ipld import marshal, multihash diff --git a/tests/web/test_outputs.py b/tests/web/test_outputs.py index 29e6e18..6909116 100644 --- a/tests/web/test_outputs.py +++ b/tests/web/test_outputs.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 - import pytest + from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer from unittest.mock import MagicMock, patch diff --git a/tests/web/test_transactions.py b/tests/web/test_transactions.py index 1491d7c..8077b71 100644 --- a/tests/web/test_transactions.py +++ b/tests/web/test_transactions.py @@ -4,15 +4,13 @@ # Code is Apache-2.0 and docs are CC-BY-4.0 import json -from unittest.mock import Mock, patch - import base58 import pytest + +from unittest.mock import Mock, patch from cryptoconditions import Ed25519Sha256 from ipld import multihash, marshal - from hashlib import sha3_256 - from transactions.common import crypto from transactions.common.transaction import Transaction from transactions.types.assets.create import Create diff --git a/tests/web/test_websocket_server.py b/tests/web/test_websocket_server.py index 7e61231..49405e8 100644 --- a/tests/web/test_websocket_server.py +++ b/tests/web/test_websocket_server.py @@ -7,15 +7,13 @@ import asyncio import json import queue import threading +import pytest # from unittest.mock import patch from transactions.types.assets.create import Create from transactions.types.assets.transfer import Transfer from ipld import multihash, marshal -import pytest - - class MockWebSocket: def __init__(self): self.received = []