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

Merge c9daaf5ec046c039819394949cf852a7817e3ed1 into 3cf368aab7d64eab35fd3414333ca614e86e14c3

Browse Source
This commit is contained in:
codegeschrei 2018-08-29 17:51:00 +00:00 committed by GitHub
commit 0dbcba6cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/common/transaction.py
View File

@ -94,7 +94,7 @@ class Input(object):
""" """
try: try:
fulfillment = self.fulfillment.serialize_uri() fulfillment = self.fulfillment.serialize_uri()
except (TypeError, AttributeError, ASN1EncodeError): except (TypeError, AttributeError, ASN1EncodeError, ASN1DecodeError):
fulfillment = _fulfillment_to_details(self.fulfillment) fulfillment = _fulfillment_to_details(self.fulfillment)
try: try:

2
setup.py
View File

@ -79,7 +79,7 @@ install_requires = [
# TODO Consider not installing the db drivers, or putting them in extras. # TODO Consider not installing the db drivers, or putting them in extras.
'pymongo~=3.6', 'pymongo~=3.6',
'pysha3~=1.0.2', 'pysha3~=1.0.2',
'cryptoconditions~=0.6.0.dev', 'cryptoconditions~=0.7.0',
'python-rapidjson~=0.6.0', 'python-rapidjson~=0.6.0',
'logstats~=0.2.1', 'logstats~=0.2.1',
'flask>=0.10.1', 'flask>=0.10.1',