Resolved errors related to transactions.common

This commit is contained in:
ArpitShukla007 2022-03-09 17:39:14 +00:00
parent e9b7aa0fc5
commit 1c744b744b
3 changed files with 17 additions and 8 deletions

View File

@ -10,6 +10,14 @@ import rapidjson
import planetmint import planetmint
from planetmint.transactions.common.exceptions import ValidationError from planetmint.transactions.common.exceptions import ValidationError
from cryptoconditions import Fulfillment, ThresholdSha256, Ed25519Sha256
from planetmint.transactions.common.exceptions import (KeypairMismatchException,
InputDoesNotExist, DoubleSpend,
InvalidHash, InvalidSignature,
AmountError, AssetIdMismatch,
ThresholdTooDeep)
from cryptoconditions.exceptions import (
ParsingError, ASN1DecodeError, ASN1EncodeError, UnsupportedTypeError)
def gen_timestamp(): def gen_timestamp():

View File

@ -99,7 +99,7 @@ def test_single_in_single_own_multiple_out_mix_own_create(alice, user_pk, b):
def test_single_in_multiple_own_single_out_single_own_create(alice, b, user_pk, def test_single_in_multiple_own_single_out_single_own_create(alice, b, user_pk,
user_sk): user_sk):
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.transaction import _fulfillment_to_details from planetmint.transactions.common.utils import _fulfillment_to_details
tx = Transaction.create([alice.public_key, user_pk], [([user_pk], 100)], asset={'name': random.random()}) tx = Transaction.create([alice.public_key, user_pk], [([user_pk], 100)], asset={'name': random.random()})
tx_signed = tx.sign([alice.private_key, user_sk]) tx_signed = tx.sign([alice.private_key, user_sk])
@ -249,7 +249,7 @@ def test_single_in_single_own_multiple_out_mix_own_transfer(alice, b, user_pk,
def test_single_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk, def test_single_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk,
user_sk): user_sk):
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.transaction import _fulfillment_to_details from planetmint.transactions.common.utils import _fulfillment_to_details
# CREATE divisible asset # CREATE divisible asset
tx_create = Transaction.create([alice.public_key], [([alice.public_key, user_pk], 100)], tx_create = Transaction.create([alice.public_key], [([alice.public_key, user_pk], 100)],
@ -316,7 +316,7 @@ def test_multiple_in_single_own_single_out_single_own_transfer(alice, b, user_pk
def test_multiple_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk, def test_multiple_in_multiple_own_single_out_single_own_transfer(alice, b, user_pk,
user_sk): user_sk):
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.transaction import _fulfillment_to_details from planetmint.transactions.common.utils import _fulfillment_to_details
# CREATE divisible asset # CREATE divisible asset
tx_create = Transaction.create([alice.public_key], [([user_pk, alice.public_key], 50), tx_create = Transaction.create([alice.public_key], [([user_pk, alice.public_key], 50),
@ -357,7 +357,7 @@ def test_multiple_in_multiple_own_single_out_single_own_transfer(alice, b, user_
def test_muiltiple_in_mix_own_multiple_out_single_own_transfer(alice, b, user_pk, def test_muiltiple_in_mix_own_multiple_out_single_own_transfer(alice, b, user_pk,
user_sk): user_sk):
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.transaction import _fulfillment_to_details from planetmint.transactions.common.utils import _fulfillment_to_details
# CREATE divisible asset # CREATE divisible asset
tx_create = Transaction.create([alice.public_key], [([user_pk], 50), ([user_pk, alice.public_key], 50)], tx_create = Transaction.create([alice.public_key], [([user_pk], 50), ([user_pk, alice.public_key], 50)],
@ -397,7 +397,7 @@ def test_muiltiple_in_mix_own_multiple_out_single_own_transfer(alice, b, user_pk
def test_muiltiple_in_mix_own_multiple_out_mix_own_transfer(alice, b, user_pk, def test_muiltiple_in_mix_own_multiple_out_mix_own_transfer(alice, b, user_pk,
user_sk): user_sk):
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.transaction import _fulfillment_to_details from planetmint.transactions.common.utils import _fulfillment_to_details
# CREATE divisible asset # CREATE divisible asset
tx_create = Transaction.create([alice.public_key], [([user_pk], 50), ([user_pk, alice.public_key], 50)], tx_create = Transaction.create([alice.public_key], [([user_pk], 50), ([user_pk, alice.public_key], 50)],

View File

@ -20,6 +20,7 @@ from planetmint.transactions.common.exceptions import (AmountError,
SchemaValidationError, SchemaValidationError,
ThresholdTooDeep) ThresholdTooDeep)
from planetmint.models import Transaction from planetmint.models import Transaction
from planetmint.transactions.common.utils import _fulfillment_to_details, _fulfillment_from_details
################################################################################ ################################################################################
# Helper functions # Helper functions
@ -226,7 +227,7 @@ def test_handle_threshold_overflow():
'subconditions': [cond], 'subconditions': [cond],
} }
with pytest.raises(ThresholdTooDeep): with pytest.raises(ThresholdTooDeep):
transaction._fulfillment_from_details(cond) _fulfillment_from_details(cond)
def test_unsupported_condition_type(): def test_unsupported_condition_type():
@ -234,10 +235,10 @@ def test_unsupported_condition_type():
from cryptoconditions.exceptions import UnsupportedTypeError from cryptoconditions.exceptions import UnsupportedTypeError
with pytest.raises(UnsupportedTypeError): with pytest.raises(UnsupportedTypeError):
transaction._fulfillment_from_details({'type': 'a'}) _fulfillment_from_details({'type': 'a'})
with pytest.raises(UnsupportedTypeError): with pytest.raises(UnsupportedTypeError):
transaction._fulfillment_to_details(MagicMock(type_name='a')) _fulfillment_to_details(MagicMock(type_name='a'))
################################################################################ ################################################################################