diff --git a/planetmint/transactions/types/elections/vote.py b/planetmint/transactions/types/elections/vote.py index 9b8c33b..c102a8c 100644 --- a/planetmint/transactions/types/elections/vote.py +++ b/planetmint/transactions/types/elections/vote.py @@ -5,7 +5,6 @@ from planetmint.transactions.types.assets.create import Create from planetmint.transactions.types.assets.transfer import Transfer -from planetmint.transactions.common.transaction import Transaction from planetmint.transactions.common.schema import ( _validate_schema, TX_SCHEMA_COMMON, TX_SCHEMA_TRANSFER, TX_SCHEMA_VOTE) diff --git a/tests/assets/test_divisible_assets.py b/tests/assets/test_divisible_assets.py index d9d680f..caf3a97 100644 --- a/tests/assets/test_divisible_assets.py +++ b/tests/assets/test_divisible_assets.py @@ -18,7 +18,6 @@ from planetmint.transactions.common.exceptions import DoubleSpend # Single output # Single owners_after def test_single_in_single_own_single_out_single_own_create(alice, user_pk, b): - tx = Create.generate([alice.public_key], [([user_pk], 100)], asset={'name': random.random()}) tx_signed = tx.sign([alice.private_key]) @@ -35,7 +34,6 @@ def test_single_in_single_own_single_out_single_own_create(alice, user_pk, b): # Multiple outputs # Single owners_after per output def test_single_in_single_own_multiple_out_single_own_create(alice, user_pk, b): - tx = Create.generate([alice.public_key], [([user_pk], 50), ([user_pk], 50)], asset={'name': random.random()}) @@ -245,7 +243,6 @@ def test_single_in_single_own_multiple_out_mix_own_transfer(alice, b, user_pk, # Single owners_after def test_single_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk, user_sk): - from planetmint.transactions.common.utils import _fulfillment_to_details # CREATE divisible asset @@ -281,7 +278,6 @@ def test_single_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk # Single owners_after def test_multiple_in_single_own_single_out_single_own_transfer(alice, b, user_pk, user_sk): - # CREATE divisible asset tx_create = Create.generate([alice.public_key], [([user_pk], 50), ([user_pk], 50)], asset={'name': random.random()}) @@ -311,7 +307,6 @@ def test_multiple_in_single_own_single_out_single_own_transfer(alice, b, user_pk # Single owners_after def test_multiple_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk, user_sk): - from planetmint.transactions.common.utils import _fulfillment_to_details # CREATE divisible asset @@ -352,7 +347,6 @@ def test_multiple_in_multiple_own_single_out_single_own_transfer(alice, b, user_ # Single owners_after def test_muiltiple_in_mix_own_multiple_out_single_own_transfer(alice, b, user_pk, user_sk): - from planetmint.transactions.common.utils import _fulfillment_to_details # CREATE divisible asset @@ -392,7 +386,6 @@ def test_muiltiple_in_mix_own_multiple_out_single_own_transfer(alice, b, user_pk # owners_after def test_muiltiple_in_mix_own_multiple_out_mix_own_transfer(alice, b, user_pk, user_sk): - from planetmint.transactions.common.utils import _fulfillment_to_details # CREATE divisible asset @@ -437,7 +430,7 @@ def test_muiltiple_in_mix_own_multiple_out_mix_own_transfer(alice, b, user_pk, # Single output # Single owners_after def test_multiple_in_different_transactions(alice, b, user_pk, user_sk): - + # CREATE divisible asset # `b` creates a divisible asset and assigns 50 shares to `b` and # 50 shares to `user_pk` @@ -480,7 +473,6 @@ def test_multiple_in_different_transactions(alice, b, user_pk, user_sk): # inputs needs to match the amount being sent in the outputs. # In other words `amount_in_inputs - amount_in_outputs == 0` def test_amount_error_transfer(alice, b, user_pk, user_sk): - from planetmint.transactions.common.exceptions import AmountError # CREATE divisible asset @@ -536,7 +528,6 @@ def test_threshold_same_public_key(alice, b, user_pk, user_sk): def test_sum_amount(alice, b, user_pk, user_sk): - # CREATE divisible asset with 3 outputs with amount 1 tx_create = Create.generate([alice.public_key], [([user_pk], 1), ([user_pk], 1), ([user_pk], 1)], @@ -561,7 +552,6 @@ def test_sum_amount(alice, b, user_pk, user_sk): def test_divide(alice, b, user_pk, user_sk): - # CREATE divisible asset with 1 output with amount 3 tx_create = Create.generate([alice.public_key], [([user_pk], 3)], asset={'name': random.random()}) diff --git a/tests/common/test_transaction.py b/tests/common/test_transaction.py index ce45cd1..691e475 100644 --- a/tests/common/test_transaction.py +++ b/tests/common/test_transaction.py @@ -705,7 +705,6 @@ def test_create_create_transaction_single_io(user_output, user_pub, data): def test_validate_single_io_create_transaction(user_pub, user_priv, data, asset_definition): - from planetmint.transactions.common.transaction import Transaction tx = Create.generate([user_pub], [([user_pub], 1)], metadata=data) tx = tx.sign([user_priv]) @@ -741,7 +740,6 @@ def test_create_create_transaction_multiple_io(user_output, user2_output, user_p def test_validate_multiple_io_create_transaction(user_pub, user_priv, user2_pub, user2_priv, asset_definition): - from planetmint.transactions.common.transaction import Transaction from .utils import validate_transaction_model tx = Create.generate([user_pub, user2_pub], @@ -787,7 +785,6 @@ def test_create_create_transaction_threshold(user_pub, user2_pub, user3_pub, def test_validate_threshold_create_transaction(user_pub, user_priv, user2_pub, data, asset_definition): - from planetmint.transactions.common.transaction import Transaction from .utils import validate_transaction_model tx = Create.generate([user_pub], [([user_pub, user2_pub], 1)], @@ -799,8 +796,6 @@ def test_validate_threshold_create_transaction(user_pub, user_priv, user2_pub, def test_create_create_transaction_with_invalid_parameters(user_pub): - from planetmint.transactions.common.transaction import Transaction - with raises(TypeError): Create.generate('not a list') with raises(TypeError): @@ -943,8 +938,6 @@ def test_create_transfer_transaction_multiple_io(user_pub, user_priv, def test_create_transfer_with_invalid_parameters(tx, user_pub): - from planetmint.transactions.common.transaction import Transaction - with raises(TypeError): Transfer.generate({}, [], tx.id) with raises(ValueError): diff --git a/tests/db/test_planetmint_api.py b/tests/db/test_planetmint_api.py index 0f08358..cb95598 100644 --- a/tests/db/test_planetmint_api.py +++ b/tests/db/test_planetmint_api.py @@ -16,7 +16,6 @@ pytestmark = pytest.mark.bdb class TestBigchainApi(object): def test_get_spent_with_double_spend_detected(self, b, alice): - from planetmint.models import Transaction from planetmint.transactions.common.exceptions import DoubleSpend from planetmint.exceptions import CriticalDoubleSpend @@ -46,7 +45,6 @@ class TestBigchainApi(object): b.get_spent(tx.id, 0) def test_double_inclusion(self, b, alice): - from planetmint.models import Transaction from planetmint.backend.exceptions import OperationError tx = Create.generate([alice.public_key], [([alice.public_key], 1)]) @@ -58,7 +56,6 @@ class TestBigchainApi(object): b.store_bulk_transactions([tx]) def test_text_search(self, b, alice): - from planetmint.models import Transaction # define the assets asset1 = {'msg': 'Planetmint 1'} @@ -85,7 +82,6 @@ class TestBigchainApi(object): from cryptoconditions import Ed25519Sha256 from planetmint.transactions.common.exceptions import InputDoesNotExist from planetmint.transactions.common.transaction import Input, TransactionLink - from planetmint.models import Transaction # Create an input for a non existing transaction input = Input(Ed25519Sha256(public_key=b58decode(user_pk)), @@ -97,7 +93,6 @@ class TestBigchainApi(object): tx.validate(b) def test_write_transaction(self, b, user_sk, user_pk, alice, create_tx): - from planetmint.models import Transaction asset1 = {'msg': 'Planetmint 1'} @@ -130,7 +125,6 @@ class TestTransactionValidation(object): def test_non_create_valid_input_wrong_owner(self, b, user_pk): from planetmint.transactions.common.crypto import generate_key_pair from planetmint.transactions.common.exceptions import InvalidSignature - from planetmint.models import Transaction input_tx = b.fastquery.get_outputs_by_public_key(user_pk).pop() input_transaction = b.get_transaction(input_tx.txid) @@ -159,7 +153,6 @@ class TestMultipleInputs(object): def test_transfer_single_owner_single_input(self, b, inputs, user_pk, user_sk): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() @@ -180,7 +173,6 @@ class TestMultipleInputs(object): user_pk, inputs): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() user3_sk, user3_pk = crypto.generate_key_pair() @@ -202,7 +194,6 @@ class TestMultipleInputs(object): user_pk, alice): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() user3_sk, user3_pk = crypto.generate_key_pair() @@ -230,7 +221,6 @@ class TestMultipleInputs(object): user_pk, alice): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() user3_sk, user3_pk = crypto.generate_key_pair() @@ -256,7 +246,6 @@ class TestMultipleInputs(object): def test_get_owned_ids_single_tx_single_output(self, b, user_sk, user_pk, alice): from planetmint.transactions.common import crypto from planetmint.transactions.common.transaction import TransactionLink - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() @@ -284,7 +273,6 @@ class TestMultipleInputs(object): user_pk, alice): from planetmint.transactions.common import crypto from planetmint.transactions.common.transaction import TransactionLink - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() @@ -318,7 +306,6 @@ class TestMultipleInputs(object): def test_get_owned_ids_multiple_owners(self, b, user_sk, user_pk, alice): from planetmint.transactions.common import crypto from planetmint.transactions.common.transaction import TransactionLink - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() user3_sk, user3_pk = crypto.generate_key_pair() @@ -349,7 +336,6 @@ class TestMultipleInputs(object): def test_get_spent_single_tx_single_output(self, b, user_sk, user_pk, alice): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() @@ -375,7 +361,6 @@ class TestMultipleInputs(object): def test_get_spent_single_tx_multiple_outputs(self, b, user_sk, user_pk, alice): from planetmint.transactions.common import crypto - from planetmint.models import Transaction # create a new users user2_sk, user2_pk = crypto.generate_key_pair() @@ -412,7 +397,6 @@ class TestMultipleInputs(object): def test_get_spent_multiple_owners(self, b, user_sk, user_pk, alice): from planetmint.transactions.common import crypto - from planetmint.models import Transaction user2_sk, user2_pk = crypto.generate_key_pair() user3_sk, user3_pk = crypto.generate_key_pair() @@ -498,7 +482,6 @@ def test_cant_spend_same_input_twice_in_tx(b, alice): """Recreate duplicated fulfillments bug https://github.com/planetmint/planetmint/issues/1099 """ - from planetmint.models import Transaction from planetmint.transactions.common.exceptions import DoubleSpend # create a divisible asset @@ -520,7 +503,6 @@ def test_cant_spend_same_input_twice_in_tx(b, alice): def test_transaction_unicode(b, alice): import copy from planetmint.transactions.common.utils import serialize - from planetmint.models import Transaction # http://www.fileformat.info/info/unicode/char/1f37a/index.htm beer_python = {'beer': '\N{BEER MUG}'} diff --git a/tests/tendermint/test_core.py b/tests/tendermint/test_core.py index c8e7942..6f4ae8f 100644 --- a/tests/tendermint/test_core.py +++ b/tests/tendermint/test_core.py @@ -204,7 +204,6 @@ def test_info(b): def test_check_tx__signed_create_is_ok(b): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -221,7 +220,6 @@ def test_check_tx__signed_create_is_ok(b): def test_check_tx__unsigned_create_is_error(b): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -238,7 +236,6 @@ def test_check_tx__unsigned_create_is_error(b): def test_deliver_tx__valid_create_updates_db_and_emits_event(b, init_chain_request): import multiprocessing as mp from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -275,7 +272,6 @@ def test_deliver_tx__valid_create_updates_db_and_emits_event(b, init_chain_reque def test_deliver_tx__double_spend_fails(b, init_chain_request): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -304,7 +300,6 @@ def test_deliver_tx__double_spend_fails(b, init_chain_request): def test_deliver_transfer_tx__double_spend_fails(b, init_chain_request): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair app = App(b) @@ -384,7 +379,6 @@ def test_end_block_return_validator_updates(b, init_chain_request): def test_store_pre_commit_state_in_end_block(b, alice, init_chain_request): from planetmint import App from planetmint.backend import query - from planetmint.models import Transaction tx = Create.generate([alice.public_key], [([alice.public_key], 1)], diff --git a/tests/test_core.py b/tests/test_core.py index d9a6efa..ae02b44 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -204,7 +204,6 @@ def test_info(b): def test_check_tx__signed_create_is_ok(b): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -221,7 +220,6 @@ def test_check_tx__signed_create_is_ok(b): def test_check_tx__unsigned_create_is_error(b): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -238,7 +236,6 @@ def test_check_tx__unsigned_create_is_error(b): def test_deliver_tx__valid_create_updates_db_and_emits_event(b, init_chain_request): import multiprocessing as mp from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -275,7 +272,6 @@ def test_deliver_tx__valid_create_updates_db_and_emits_event(b, init_chain_reque def test_deliver_tx__double_spend_fails(b, eventqueue_fixture, init_chain_request): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair alice = generate_key_pair() @@ -304,7 +300,6 @@ def test_deliver_tx__double_spend_fails(b, eventqueue_fixture, init_chain_reques def test_deliver_transfer_tx__double_spend_fails(b, init_chain_request): from planetmint import App - from planetmint.models import Transaction from planetmint.transactions.common.crypto import generate_key_pair app = App(b) @@ -384,7 +379,6 @@ def test_end_block_return_validator_updates(b, init_chain_request): def test_store_pre_commit_state_in_end_block(b, alice, init_chain_request): from planetmint import App from planetmint.backend import query - from planetmint.models import Transaction tx = Create.generate([alice.public_key], [([alice.public_key], 1)], diff --git a/tests/web/test_assets.py b/tests/web/test_assets.py index 58136c3..b88c2ef 100644 --- a/tests/web/test_assets.py +++ b/tests/web/test_assets.py @@ -23,7 +23,6 @@ def test_get_assets_with_missing_text_search(client): @pytest.mark.bdb def test_get_assets_tendermint(client, b, alice): - from planetmint.models import Transaction # test returns empty list when no assets are found res = client.get(ASSETS_ENDPOINT + '?search=abc') @@ -49,7 +48,6 @@ def test_get_assets_tendermint(client, b, alice): @pytest.mark.bdb def test_get_assets_limit_tendermint(client, b, alice): - from planetmint.models import Transaction # create two assets asset1 = {'msg': 'abc 1'} diff --git a/tests/web/test_transactions.py b/tests/web/test_transactions.py index 109146e..b613c50 100644 --- a/tests/web/test_transactions.py +++ b/tests/web/test_transactions.py @@ -214,7 +214,6 @@ def test_post_create_transaction_with_invalid_structure(client): @pytest.mark.abci @patch('planetmint.web.views.base.logger') def test_post_create_transaction_with_invalid_schema(mock_logger, client): - from planetmint.models import Transaction user_priv, user_pub = crypto.generate_key_pair() tx = Create.generate([user_pub], [([user_pub], 1)]).to_dict() del tx['version'] diff --git a/tests/web/test_websocket_server.py b/tests/web/test_websocket_server.py index 6846554..d7d9d85 100644 --- a/tests/web/test_websocket_server.py +++ b/tests/web/test_websocket_server.py @@ -25,7 +25,6 @@ class MockWebSocket: def test_eventify_block_works_with_any_transaction(): from planetmint.web.websocket_server import eventify_block from planetmint.transactions.common.crypto import generate_key_pair - from planetmint.lib import Transaction alice = generate_key_pair() @@ -140,7 +139,6 @@ async def test_websocket_string_event(test_client, loop): async def test_websocket_block_event(b, test_client, loop): from planetmint import events from planetmint.web.websocket_server import init_app, POISON_PILL, EVENTS_ENDPOINT - from planetmint.models import Transaction from planetmint.transactions.common import crypto user_priv, user_pub = crypto.generate_key_pair() @@ -186,7 +184,6 @@ def test_integration_from_webapi_to_websocket(monkeypatch, client, loop): # TODO processes does not exist anymore, when reactivating this test it # will fail because of this from planetmint import processes - from planetmint.models import Transaction # Start Planetmint processes.start()