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

PR review @vrde

Browse Source
This commit is contained in:
diminator 2016-08-25 10:44:16 +02:00
parent 8b55f24998
commit 5724fb5c43
No known key found for this signature in database
GPG Key ID: C3D8590E6D0D439A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bigchaindb/web/views/transactions.py
View File

@ -65,8 +65,8 @@ class TransactionStatusApi(Resource):
tx_id (str): the id of the transaction. tx_id (str): the id of the transaction.
Return: Return:
A JSON string containing the status of the transaction. A ``dict`` in the format ``{'status': <status>}``, where ``<status>``
Possible values: "valid", "invalid", "undecided", "backlog" is one of "valid", "invalid", "undecided", "backlog".
""" """
pool = current_app.config['bigchain_pool'] pool = current_app.config['bigchain_pool']
@ -85,7 +85,7 @@ class TransactionListApi(Resource):
"""API endpoint to push transactions to the Federation. """API endpoint to push transactions to the Federation.
Return: Return:
A JSON string containing the data about the transaction. A ``dict`` containing the data about the transaction.
""" """
pool = current_app.config['bigchain_pool'] pool = current_app.config['bigchain_pool']
monitor = current_app.config['monitor'] monitor = current_app.config['monitor']

2
setup.py
View File

@ -102,7 +102,7 @@ setup(
'logstats==0.2.1', 'logstats==0.2.1',
'base58==0.2.2', 'base58==0.2.2',
'flask==0.10.1', 'flask==0.10.1',
'flask-restful==0.3.5', 'flask-restful~=0.3.0',
'requests~=2.9', 'requests~=2.9',
'gunicorn~=19.0', 'gunicorn~=19.0',
'multipipes~=0.1.0', 'multipipes~=0.1.0',