diff --git a/planetmint/__init__.py b/planetmint/__init__.py index bb768cd..e0a4444 100644 --- a/planetmint/__init__.py +++ b/planetmint/__init__.py @@ -8,7 +8,7 @@ from transactions.types.elections.validator_election import ValidatorElection # from transactions.types.elections.vote import Vote # noqa from transactions.types.elections.chain_migration_election import ChainMigrationElection -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.abci.core import App diff --git a/planetmint/abci/core.py b/planetmint/abci/core.py index ef82584..8b71481 100644 --- a/planetmint/abci/core.py +++ b/planetmint/abci/core.py @@ -22,7 +22,7 @@ from tendermint.abci.types_pb2 import ( ResponseCommit, ) -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.model.models import Models from planetmint.abci.tendermint_utils import decode_transaction, calculate_hash, decode_validator from planetmint.abci.block import Block diff --git a/planetmint/abci/parallel_validation.py b/planetmint/abci/parallel_validation.py index 60ca0fa..e765656 100644 --- a/planetmint/abci/parallel_validation.py +++ b/planetmint/abci/parallel_validation.py @@ -7,7 +7,7 @@ import multiprocessing from collections import defaultdict from planetmint import App -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.abci.tendermint_utils import decode_transaction from abci.application import OkCode from tendermint.abci.types_pb2 import ( diff --git a/planetmint/abci/rpc.py b/planetmint/abci/rpc.py index fb2c979..8f3ef3d 100644 --- a/planetmint/abci/rpc.py +++ b/planetmint/abci/rpc.py @@ -8,7 +8,7 @@ from transactions.common.transaction_mode_types import ( ) from planetmint.abci.tendermint_utils import encode_transaction -from planetmint.application.validation import logger +from planetmint.application.validator import logger from planetmint.config_utils import autoconfigure from planetmint.config import Config diff --git a/planetmint/application/__init__.py b/planetmint/application/__init__.py index e69de29..b23ee63 100644 --- a/planetmint/application/__init__.py +++ b/planetmint/application/__init__.py @@ -0,0 +1,2 @@ +from .validator import Validator +from .basevalidationrules import BaseValidationRules \ No newline at end of file diff --git a/planetmint/application/validation.py b/planetmint/application/validator.py similarity index 100% rename from planetmint/application/validation.py rename to planetmint/application/validator.py diff --git a/planetmint/commands/planetmint.py b/planetmint/commands/planetmint.py index b325802..697c32e 100644 --- a/planetmint/commands/planetmint.py +++ b/planetmint/commands/planetmint.py @@ -27,7 +27,7 @@ from transactions.common.transaction import Transaction from planetmint.abci.rpc import ABCI_RPC from planetmint.abci.utils import load_node_key from planetmint import ValidatorElection -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.backend import schema from planetmint.commands import utils from planetmint.commands.utils import configure_planetmint, input_on_stderr diff --git a/planetmint/start.py b/planetmint/start.py index b5fba52..55a0db1 100644 --- a/planetmint/start.py +++ b/planetmint/start.py @@ -7,7 +7,7 @@ import logging import setproctitle from planetmint.config import Config -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.abci.core import App from planetmint.abci.parallel_validation import ParallelValidationApp from planetmint.web import server, websocket_server diff --git a/planetmint/web/server.py b/planetmint/web/server.py index 2c58e26..e6378e6 100644 --- a/planetmint/web/server.py +++ b/planetmint/web/server.py @@ -15,7 +15,7 @@ import gunicorn.app.base from flask import Flask from flask_cors import CORS from planetmint import utils -from planetmint.application.validation import Validator +from planetmint.application.validator import Validator from planetmint.web.routes import add_routes from planetmint.web.strip_content_type_middleware import StripContentTypeMiddleware diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index d468294..8f16b25 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -249,7 +249,7 @@ def test_calling_main(start_mock, monkeypatch): assert start_mock.called is True -@patch("planetmint.application.validation.Validator.rollback") +@patch("planetmint.application.validator.Validator.rollback") @patch("planetmint.start.start") def test_recover_db_on_start(mock_rollback, mock_start, mocked_setup_logging): from planetmint.commands.planetmint import run_start diff --git a/tests/conftest.py b/tests/conftest.py index 378b34d..b56cfc5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -257,7 +257,7 @@ def test_models(): @pytest.fixture def test_validator(): - from planetmint.application.validation import Validator + from planetmint.application import Validator return Validator() @pytest.fixture @@ -267,7 +267,7 @@ def test_abci_rpc(): @pytest.fixture def b(): - from planetmint.application.validation import Validator + from planetmint.application import Validator return Validator() diff --git a/tests/test_core.py b/tests/test_core.py index 3e2c97d..3161d5e 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -38,7 +38,7 @@ def config(request, monkeypatch): def test_bigchain_class_default_initialization(config): - from planetmint.application.validation import Validator + from planetmint.application import Validator from planetmint.application.basevalidationrules import BaseValidationRules validator = Validator() diff --git a/tests/web/conftest.py b/tests/web/conftest.py index 8deaf83..31b5cc6 100644 --- a/tests/web/conftest.py +++ b/tests/web/conftest.py @@ -9,7 +9,7 @@ import pytest @pytest.fixture def app(request): from planetmint.web import server - from planetmint.application.validation import Validator + from planetmint.application import Validator if request.config.getoption("--database-backend") == "localmongodb": app = server.create_app(debug=True, planetmint_factory=Validator)