From c2a2c0c3cc526af65cf383fb2199a166ef44bbf9 Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Tue, 27 Sep 2022 18:00:58 +0200 Subject: [PATCH] moved upsert_validator txs to transactions, updated imports Signed-off-by: Lorenz Herzberger --- planetmint/__init__.py | 2 +- planetmint/core.py | 2 +- .../types/elections}/validator_election.py | 0 .../types/elections}/validator_utils.py | 0 planetmint/upsert_validator/__init__.py | 7 ------- tests/conftest.py | 3 +-- tests/elections/test_election.py | 2 +- tests/tendermint/test_core.py | 4 ++-- tests/test_core.py | 18 ------------------ tests/upsert_validator/conftest.py | 2 +- .../test_upsert_validator_vote.py | 2 +- .../test_validator_election.py | 2 +- 12 files changed, 9 insertions(+), 35 deletions(-) rename planetmint/{upsert_validator => transactions/types/elections}/validator_election.py (100%) rename planetmint/{upsert_validator => transactions/types/elections}/validator_utils.py (100%) delete mode 100644 planetmint/upsert_validator/__init__.py diff --git a/planetmint/__init__.py b/planetmint/__init__.py index ad0a994..1ba0f13 100644 --- a/planetmint/__init__.py +++ b/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 diff --git a/planetmint/core.py b/planetmint/core.py index 9fcfc31..ee3a4fc 100644 --- a/planetmint/core.py +++ b/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 diff --git a/planetmint/upsert_validator/validator_election.py b/planetmint/transactions/types/elections/validator_election.py similarity index 100% rename from planetmint/upsert_validator/validator_election.py rename to planetmint/transactions/types/elections/validator_election.py diff --git a/planetmint/upsert_validator/validator_utils.py b/planetmint/transactions/types/elections/validator_utils.py similarity index 100% rename from planetmint/upsert_validator/validator_utils.py rename to planetmint/transactions/types/elections/validator_utils.py diff --git a/planetmint/upsert_validator/__init__.py b/planetmint/upsert_validator/__init__.py deleted file mode 100644 index f233a0e..0000000 --- a/planetmint/upsert_validator/__init__.py +++ /dev/null @@ -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 diff --git a/tests/conftest.py b/tests/conftest.py index 443a484..0f11542 100644 --- a/tests/conftest.py +++ b/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 diff --git a/tests/elections/test_election.py b/tests/elections/test_election.py index b76a20e..1f8825b 100644 --- a/tests/elections/test_election.py +++ b/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 diff --git a/tests/tendermint/test_core.py b/tests/tendermint/test_core.py index 928fdd5..967c3b7 100644 --- a/tests/tendermint/test_core.py +++ b/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.upsert_validator.validator_utils import new_validator_set +from planetmint.transactions.types.elections.validator_election import ValidatorElection +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__ diff --git a/tests/test_core.py b/tests/test_core.py index f2b7cbc..e8fefde 100644 --- a/tests/test_core.py +++ b/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): diff --git a/tests/upsert_validator/conftest.py b/tests/upsert_validator/conftest.py index 1749c5b..9eb6334 100644 --- a/tests/upsert_validator/conftest.py +++ b/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 diff --git a/tests/upsert_validator/test_upsert_validator_vote.py b/tests/upsert_validator/test_upsert_validator_vote.py index 9ec7239..7982b0c 100644 --- a/tests/upsert_validator/test_upsert_validator_vote.py +++ b/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 diff --git a/tests/upsert_validator/test_validator_election.py b/tests/upsert_validator/test_validator_election.py index fa0e73c..a43e38f 100644 --- a/tests/upsert_validator/test_validator_election.py +++ b/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,