Resolved issues of election transaction

planetmint/__init__.py

@@ -97,7 +97,7 @@ _config = copy.deepcopy(config)
 from planetmint.transactions.common.transaction import Transaction  # noqa
 from planetmint import models                          # noqa
 from planetmint.upsert_validator import ValidatorElection  # noqa
-from planetmint.elections.vote import Vote  # noqa
+from planetmint.transactions.types.elections.vote import Vote  # noqa
 
 Transaction.register_type(Transaction.CREATE, models.Transaction)
 Transaction.register_type(Transaction.TRANSFER, models.Transaction)

planetmint/commands/planetmint.py

@@ -20,7 +20,7 @@ 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.elections.vote import Vote
+from planetmint.transactions.types.elections.vote import Vote
 import planetmint
 from planetmint import (backend, ValidatorElection,
                         Planetmint)

planetmint/core.py

@@ -21,7 +21,7 @@ from tendermint.abci.types_pb2 import (
     ResponseCommit
 )
 from planetmint import Planetmint
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.tendermint_utils import (decode_transaction,
                                          calculate_hash)
 from planetmint.lib import Block

planetmint/migrations/chain_migration_election.py

@@ -1,7 +1,7 @@
 import json
 
 from planetmint.transactions.common.schema import TX_SCHEMA_CHAIN_MIGRATION_ELECTION
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 
 
 class ChainMigrationElection(Election):

planetmint/upsert_validator/validator_election.py

@@ -4,7 +4,7 @@
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
 from planetmint.transactions.common.exceptions import InvalidPowerChange
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.transactions.common.schema import TX_SCHEMA_VALIDATOR_ELECTION
 from .validator_utils import (new_validator_set, encode_validator, validate_asset_public_key)
 

tests/commands/test_commands.py

@@ -13,7 +13,7 @@ import pytest
 
 from planetmint import ValidatorElection
 from planetmint.commands.planetmint import run_election_show
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.lib import Block
 from planetmint.migrations.chain_migration_election import ChainMigrationElection
 

tests/elections/test_election.py

@@ -3,7 +3,7 @@ import pytest
 from tests.utils import generate_election, generate_validators
 
 from planetmint.lib import Block
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.migrations.chain_migration_election import ChainMigrationElection
 from planetmint.upsert_validator.validator_election import ValidatorElection
 

tests/tendermint/test_core.py

@@ -16,7 +16,7 @@ from planetmint.transactions.common.crypto import generate_key_pair
 from planetmint.core import (OkCode,
                              CodeTypeError,
                              rollback)
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.lib import Block
 from planetmint.migrations.chain_migration_election import ChainMigrationElection
 from planetmint.upsert_validator.validator_election import ValidatorElection

tests/test_core.py

@@ -16,7 +16,7 @@ from planetmint.transactions.common.crypto import generate_key_pair
 from planetmint.core import (OkCode,
                              CodeTypeError,
                              rollback)
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.lib import Block
 from planetmint.migrations.chain_migration_election import ChainMigrationElection
 from planetmint.upsert_validator.validator_election import ValidatorElection

tests/upsert_validator/conftest.py

@@ -19,7 +19,7 @@ def valid_upsert_validator_election_b(b, node_key, new_validator):
 
 
 @pytest.fixture
-@patch('planetmint.elections.election.uuid4', lambda: 'mock_uuid4')
+@patch('planetmint.transactions.types.elections.election.uuid4', lambda: 'mock_uuid4')
 def fixed_seed_election(b_mock, node_key, new_validator):
     voters = ValidatorElection.recipients(b_mock)
     return ValidatorElection.generate([node_key.public_key],

tests/upsert_validator/test_upsert_validator_vote.py

@@ -6,14 +6,14 @@
 import pytest
 import codecs
 
-from planetmint.elections.election import Election
+from planetmint.transactions.types.elections.election import Election
 from planetmint.tendermint_utils import public_key_to_base64
 from planetmint.upsert_validator import ValidatorElection
 from planetmint.transactions.common.exceptions import AmountError
 from planetmint.transactions.common.crypto import generate_key_pair
 from planetmint.transactions.common.exceptions import ValidationError
 from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT
-from planetmint.elections.vote import Vote
+from planetmint.transactions.types.elections.vote import Vote
 from tests.utils import generate_block, gen_vote
 
 pytestmark = [pytest.mark.execute]

tests/upsert_validator/test_validator_election.py

@@ -74,7 +74,7 @@ def test_upsert_validator_invalid_inputs_election(b_mock, new_validator, node_ke
         election.validate(b_mock)
 
 
-@patch('planetmint.elections.election.uuid4', lambda: 'mock_uuid4')
+@patch('planetmint.transactions.types.elections.election.uuid4', lambda: 'mock_uuid4')
 def test_upsert_validator_invalid_election(b_mock, new_validator, node_key, fixed_seed_election):
     voters = ValidatorElection.recipients(b_mock)
     duplicate_election = ValidatorElection.generate([node_key.public_key],

tests/utils.py

@@ -13,7 +13,7 @@ from planetmint.backend.localmongodb.connection import LocalMongoDBConnection
 from planetmint.backend.schema import TABLES
 from planetmint.transactions.common import crypto
 from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT
-from planetmint.elections.election import Election, Vote
+from planetmint.transactions.types.elections.election import Election, Vote
 from planetmint.tendermint_utils import key_to_base64