mirror of
https://github.com/planetmint/planetmint.git
synced 2025-10-14 00:59:17 +00:00
Resolved issues of election transaction
This commit is contained in:
parent
be657ca4c4
commit
327ec2dc09
@ -97,7 +97,7 @@ _config = copy.deepcopy(config)
|
|||||||
from planetmint.transactions.common.transaction import Transaction # noqa
|
from planetmint.transactions.common.transaction import Transaction # noqa
|
||||||
from planetmint import models # noqa
|
from planetmint import models # noqa
|
||||||
from planetmint.upsert_validator import ValidatorElection # 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.CREATE, models.Transaction)
|
||||||
Transaction.register_type(Transaction.TRANSFER, models.Transaction)
|
Transaction.register_type(Transaction.TRANSFER, models.Transaction)
|
||||||
|
@ -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.transaction_mode_types import BROADCAST_TX_COMMIT
|
||||||
from planetmint.transactions.common.exceptions import (DatabaseDoesNotExist,
|
from planetmint.transactions.common.exceptions import (DatabaseDoesNotExist,
|
||||||
ValidationError)
|
ValidationError)
|
||||||
from planetmint.elections.vote import Vote
|
from planetmint.transactions.types.elections.vote import Vote
|
||||||
import planetmint
|
import planetmint
|
||||||
from planetmint import (backend, ValidatorElection,
|
from planetmint import (backend, ValidatorElection,
|
||||||
Planetmint)
|
Planetmint)
|
||||||
|
@ -21,7 +21,7 @@ from tendermint.abci.types_pb2 import (
|
|||||||
ResponseCommit
|
ResponseCommit
|
||||||
)
|
)
|
||||||
from planetmint import Planetmint
|
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,
|
from planetmint.tendermint_utils import (decode_transaction,
|
||||||
calculate_hash)
|
calculate_hash)
|
||||||
from planetmint.lib import Block
|
from planetmint.lib import Block
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from planetmint.transactions.common.schema import TX_SCHEMA_CHAIN_MIGRATION_ELECTION
|
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):
|
class ChainMigrationElection(Election):
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Code is Apache-2.0 and docs are CC-BY-4.0
|
# Code is Apache-2.0 and docs are CC-BY-4.0
|
||||||
|
|
||||||
from planetmint.transactions.common.exceptions import InvalidPowerChange
|
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 planetmint.transactions.common.schema import TX_SCHEMA_VALIDATOR_ELECTION
|
||||||
from .validator_utils import (new_validator_set, encode_validator, validate_asset_public_key)
|
from .validator_utils import (new_validator_set, encode_validator, validate_asset_public_key)
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ import pytest
|
|||||||
|
|
||||||
from planetmint import ValidatorElection
|
from planetmint import ValidatorElection
|
||||||
from planetmint.commands.planetmint import run_election_show
|
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.lib import Block
|
||||||
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ import pytest
|
|||||||
from tests.utils import generate_election, generate_validators
|
from tests.utils import generate_election, generate_validators
|
||||||
|
|
||||||
from planetmint.lib import Block
|
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.migrations.chain_migration_election import ChainMigrationElection
|
||||||
from planetmint.upsert_validator.validator_election import ValidatorElection
|
from planetmint.upsert_validator.validator_election import ValidatorElection
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ from planetmint.transactions.common.crypto import generate_key_pair
|
|||||||
from planetmint.core import (OkCode,
|
from planetmint.core import (OkCode,
|
||||||
CodeTypeError,
|
CodeTypeError,
|
||||||
rollback)
|
rollback)
|
||||||
from planetmint.elections.election import Election
|
from planetmint.transactions.types.elections.election import Election
|
||||||
from planetmint.lib import Block
|
from planetmint.lib import Block
|
||||||
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
||||||
from planetmint.upsert_validator.validator_election import ValidatorElection
|
from planetmint.upsert_validator.validator_election import ValidatorElection
|
||||||
|
@ -16,7 +16,7 @@ from planetmint.transactions.common.crypto import generate_key_pair
|
|||||||
from planetmint.core import (OkCode,
|
from planetmint.core import (OkCode,
|
||||||
CodeTypeError,
|
CodeTypeError,
|
||||||
rollback)
|
rollback)
|
||||||
from planetmint.elections.election import Election
|
from planetmint.transactions.types.elections.election import Election
|
||||||
from planetmint.lib import Block
|
from planetmint.lib import Block
|
||||||
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
from planetmint.migrations.chain_migration_election import ChainMigrationElection
|
||||||
from planetmint.upsert_validator.validator_election import ValidatorElection
|
from planetmint.upsert_validator.validator_election import ValidatorElection
|
||||||
|
@ -19,7 +19,7 @@ def valid_upsert_validator_election_b(b, node_key, new_validator):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@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):
|
def fixed_seed_election(b_mock, node_key, new_validator):
|
||||||
voters = ValidatorElection.recipients(b_mock)
|
voters = ValidatorElection.recipients(b_mock)
|
||||||
return ValidatorElection.generate([node_key.public_key],
|
return ValidatorElection.generate([node_key.public_key],
|
||||||
|
@ -6,14 +6,14 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import codecs
|
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.tendermint_utils import public_key_to_base64
|
||||||
from planetmint.upsert_validator import ValidatorElection
|
from planetmint.upsert_validator import ValidatorElection
|
||||||
from planetmint.transactions.common.exceptions import AmountError
|
from planetmint.transactions.common.exceptions import AmountError
|
||||||
from planetmint.transactions.common.crypto import generate_key_pair
|
from planetmint.transactions.common.crypto import generate_key_pair
|
||||||
from planetmint.transactions.common.exceptions import ValidationError
|
from planetmint.transactions.common.exceptions import ValidationError
|
||||||
from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT
|
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
|
from tests.utils import generate_block, gen_vote
|
||||||
|
|
||||||
pytestmark = [pytest.mark.execute]
|
pytestmark = [pytest.mark.execute]
|
||||||
|
@ -74,7 +74,7 @@ def test_upsert_validator_invalid_inputs_election(b_mock, new_validator, node_ke
|
|||||||
election.validate(b_mock)
|
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):
|
def test_upsert_validator_invalid_election(b_mock, new_validator, node_key, fixed_seed_election):
|
||||||
voters = ValidatorElection.recipients(b_mock)
|
voters = ValidatorElection.recipients(b_mock)
|
||||||
duplicate_election = ValidatorElection.generate([node_key.public_key],
|
duplicate_election = ValidatorElection.generate([node_key.public_key],
|
||||||
|
@ -13,7 +13,7 @@ from planetmint.backend.localmongodb.connection import LocalMongoDBConnection
|
|||||||
from planetmint.backend.schema import TABLES
|
from planetmint.backend.schema import TABLES
|
||||||
from planetmint.transactions.common import crypto
|
from planetmint.transactions.common import crypto
|
||||||
from planetmint.transactions.common.transaction_mode_types import BROADCAST_TX_COMMIT
|
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
|
from planetmint.tendermint_utils import key_to_base64
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user