moved upsert_validator txs to transactions, updated imports

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

planetmint/__init__.py

@@ -4,7 +4,7 @@
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
 from planetmint.transactions.common.transaction import Transaction  # noqa
-from planetmint.upsert_validator import ValidatorElection  # noqa
+from planetmint.transactions.types.elections.validator_election import ValidatorElection  # noqa
 from planetmint.transactions.types.elections.vote import Vote  # noqa
 from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection
 from planetmint.lib import Planetmint

planetmint/core.py

@@ -24,7 +24,7 @@ from planetmint import Planetmint
 from planetmint.transactions.types.elections.election import Election
 from planetmint.tendermint_utils import decode_transaction, calculate_hash
 from planetmint.lib import Block
-import planetmint.upsert_validator.validator_utils as vutils
+import planetmint.transactions.types.elections.validator_utils as vutils
 from planetmint.events import EventTypes, Event
 
 

planetmint/upsert_validator/__init__.py

@@ -1,7 +0,0 @@
-# Copyright © 2020 Interplanetary Database Association e.V.,
-# 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 planetmint.upsert_validator.validator_election import ValidatorElection  # noqa

tests/conftest.py

@@ -26,7 +26,6 @@ import pytest
 
 # from pymongo import MongoClient
 
-from planetmint import ValidatorElection
 from planetmint.transactions.common import crypto
 from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT
 from planetmint.tendermint_utils import key_from_base64
@@ -36,7 +35,7 @@ from planetmint.transactions.common.exceptions import DatabaseDoesNotExist
 from planetmint.lib import Block
 from tests.utils import gen_vote
 from planetmint.config import Config
-from planetmint.upsert_validator import ValidatorElection  # noqa
+from planetmint.transactions.types.elections.validator_election import ValidatorElection  # noqa
 
 from tendermint.abci import types_pb2 as types
 from tendermint.crypto import keys_pb2

tests/elections/test_election.py

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

tests/tendermint/test_core.py

@@ -19,8 +19,8 @@ from planetmint.core import OkCode, CodeTypeError, rollback
 from planetmint.transactions.types.elections.election import Election
 from planetmint.lib import Block
 from planetmint.transactions.types.elections.chain_migration_election import ChainMigrationElection
-from planetmint.upsert_validator.validator_election import ValidatorElection
+from planetmint.transactions.types.elections.validator_election import ValidatorElection
-from planetmint.upsert_validator.validator_utils import new_validator_set
+from planetmint.transactions.types.elections.validator_utils import new_validator_set
 from planetmint.tendermint_utils import public_key_to_base64
 from planetmint.version import __tm_supported_versions__
 

tests/test_core.py

@@ -3,29 +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 json
 import pytest
-import random
-
-from tendermint.abci import types_pb2 as types
-from tendermint.crypto import keys_pb2
-
-from planetmint import App
-from planetmint.backend import query
-from planetmint.transactions.common.crypto import generate_key_pair
-from planetmint.core import OkCode, CodeTypeError, rollback
-from planetmint.transactions.types.elections.election import Election
-from planetmint.lib import Block
-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
 from planetmint.version import __tm_supported_versions__
 from planetmint.transactions.types.assets.create import Create
 from planetmint.transactions.types.assets.transfer import Transfer
 
-from tests.utils import generate_election, generate_validators
-
 
 @pytest.fixture
 def config(request, monkeypatch):

tests/upsert_validator/conftest.py

@@ -7,7 +7,7 @@ from unittest.mock import patch
 import pytest
 
 from planetmint.backend import query
-from planetmint.upsert_validator import ValidatorElection
+from planetmint.transactions.types.elections.validator_election import ValidatorElection
 
 
 @pytest.fixture

tests/upsert_validator/test_upsert_validator_vote.py

@@ -8,7 +8,7 @@ import codecs
 
 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.types.elections.validator_election 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

tests/upsert_validator/test_validator_election.py

@@ -8,7 +8,7 @@ from unittest.mock import patch
 import pytest
 
 from planetmint.tendermint_utils import public_key_to_base64
-from planetmint.upsert_validator import ValidatorElection
+from planetmint.transactions.types.elections.validator_election import ValidatorElection
 from planetmint.transactions.common.exceptions import (
     DuplicateTransaction,
     UnequalValidatorSet,