Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Output.from_dict accepts string

Browse Source
This commit is contained in:
Scott Sadler 2017-03-15 10:00:00 +01:00
parent 56b81f9d8d
commit f23bfa52d1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigchaindb/common/transaction.py
View File

@ -264,7 +264,7 @@ class Output(object):
output = { output = {
'public_keys': self.public_keys, 'public_keys': self.public_keys,
'condition': condition, 'condition': condition,
'amount': self.amount 'amount': str(self.amount),
} }
return output return output
@ -381,7 +381,11 @@ class Output(object):
except KeyError: except KeyError:
# NOTE: Hashlock condition case # NOTE: Hashlock condition case
fulfillment = data['condition']['uri'] fulfillment = data['condition']['uri']
return cls(fulfillment, data['public_keys'], data['amount']) try:
amount = int(data['amount'])
except ValueError:
raise AmountError('Invalid amount: %s' % amount)
return cls(fulfillment, data['public_keys'], amount)
class Transaction(object): class Transaction(object):

8
tests/common/test_transaction.py
View File

@ -83,7 +83,7 @@ def test_output_serialization(user_Ed25519, user_pub):
'details': user_Ed25519.to_dict(), 'details': user_Ed25519.to_dict(),
}, },
'public_keys': [user_pub], 'public_keys': [user_pub],
'amount': 1, 'amount': '1',
} }
cond = Output(user_Ed25519, [user_pub], 1) cond = Output(user_Ed25519, [user_pub], 1)
@ -101,7 +101,7 @@ def test_output_deserialization(user_Ed25519, user_pub):
'details': user_Ed25519.to_dict() 'details': user_Ed25519.to_dict()
}, },
'public_keys': [user_pub], 'public_keys': [user_pub],
'amount': 1, 'amount': '1',
} }
cond = Output.from_dict(cond) cond = Output.from_dict(cond)
@ -120,7 +120,7 @@ def test_output_hashlock_serialization():
'uri': hashlock, 'uri': hashlock,
}, },
'public_keys': None, 'public_keys': None,
'amount': 1, 'amount': '1',
} }
cond = Output(hashlock, amount=1) cond = Output(hashlock, amount=1)
@ -140,7 +140,7 @@ def test_output_hashlock_deserialization():
'uri': hashlock 'uri': hashlock
}, },
'public_keys': None, 'public_keys': None,
'amount': 1, 'amount': '1',
} }
cond = Output.from_dict(cond) cond = Output.from_dict(cond)