diff --git a/planetmint/__init__.py b/planetmint/__init__.py index 785daef..a6a02ed 100644 --- a/planetmint/__init__.py +++ b/planetmint/__init__.py @@ -8,7 +8,7 @@ import logging from planetmint.log import DEFAULT_LOGGING_CONFIG as log_config from planetmint.lib import Planetmint # noqa -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection from planetmint.version import __version__ # noqa from planetmint.core import App # noqa diff --git a/planetmint/commands/planetmint.py b/planetmint/commands/planetmint.py index 9d09571..b58f1fb 100644 --- a/planetmint/commands/planetmint.py +++ b/planetmint/commands/planetmint.py @@ -15,12 +15,12 @@ import json import sys from planetmint.core import rollback -from planetmint.migrations.chain_migration_election import ChainMigrationElection from planetmint.utils import load_node_key from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT from planetmint.transactions.common.exceptions import ( DatabaseDoesNotExist, ValidationError) from planetmint.transactions.types.elections.vote import Vote +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection import planetmint from planetmint import (backend, ValidatorElection, Planetmint) diff --git a/planetmint/migrations/__init__.py b/planetmint/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/planetmint/migrations/chain_migration_election.py b/planetmint/transactions/types/elections/chain_migration_election.py similarity index 100% rename from planetmint/migrations/chain_migration_election.py rename to planetmint/transactions/types/elections/chain_migration_election.py diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index df4c1b8..9e5bd2d 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -15,7 +15,7 @@ from planetmint import ValidatorElection from planetmint.commands.planetmint import run_election_show from planetmint.transactions.types.elections.election import Election from planetmint.lib import Block -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection from tests.utils import generate_election, generate_validators diff --git a/tests/elections/test_election.py b/tests/elections/test_election.py index e58ec4f..e8197be 100644 --- a/tests/elections/test_election.py +++ b/tests/elections/test_election.py @@ -4,7 +4,7 @@ from tests.utils import generate_election, generate_validators from planetmint.lib import Block from planetmint.transactions.types.elections.election import Election -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection from planetmint.upsert_validator.validator_election import ValidatorElection @pytest.mark.bdb diff --git a/tests/migrations/test_migration_election.py b/tests/migrations/test_migration_election.py index 3b651ff..8b7cbea 100644 --- a/tests/migrations/test_migration_election.py +++ b/tests/migrations/test_migration_election.py @@ -1,4 +1,4 @@ -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection def test_valid_migration_election(b_mock, node_key): diff --git a/tests/tendermint/test_core.py b/tests/tendermint/test_core.py index 6f4ae8f..7b2177d 100644 --- a/tests/tendermint/test_core.py +++ b/tests/tendermint/test_core.py @@ -20,7 +20,7 @@ from planetmint.core import (OkCode, rollback) from planetmint.transactions.types.elections.election import Election from planetmint.lib import Block -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection from planetmint.upsert_validator.validator_election import ValidatorElection from planetmint.upsert_validator.validator_utils import new_validator_set from planetmint.tendermint_utils import public_key_to_base64 diff --git a/tests/test_core.py b/tests/test_core.py index ae02b44..2a0bee5 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -20,7 +20,7 @@ from planetmint.core import (OkCode, rollback) from planetmint.transactions.types.elections.election import Election from planetmint.lib import Block -from planetmint.migrations.chain_migration_election import ChainMigrationElection +from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection from planetmint.upsert_validator.validator_election import ValidatorElection from planetmint.upsert_validator.validator_utils import new_validator_set from planetmint.tendermint_utils import public_key_to_base64