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

/transactions/ID only returns VALID transactions

Browse Source
This commit is contained in:
tim 2017-06-14 15:42:04 +02:00
parent 828885265d
commit 6cedab47a1
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@ class TransactionApi(Resource):
pool = current_app.config['bigchain_pool'] pool = current_app.config['bigchain_pool']
with pool() as bigchain: with pool() as bigchain:
tx = bigchain.get_transaction(tx_id) tx, status = bigchain.get_transaction(tx_id, include_status=True)
if not tx: if not tx or status is not bigchain.TX_VALID:
return make_error(404) return make_error(404)
return tx.to_dict() return tx.to_dict()

12
docs/server/source/http-client-server-api.rst
View File

@ -46,12 +46,12 @@ Transactions
Get the transaction with the ID ``tx_id``. Get the transaction with the ID ``tx_id``.
This endpoint returns a transaction if it was included in a ``VALID`` block, This endpoint returns a transaction if it was included in a ``VALID`` block.
if it is still waiting to be processed (``BACKLOG``) or is still in an All instances of a transaction in invalid/undecided blocks or the backlog
undecided block (``UNDECIDED``). All instances of a transaction in invalid are ignored and treated as if they don't exist. If a request is made for a
blocks are ignored and treated as if they don't exist. If a request is made transaction and instances of that transaction are found only in
for a transaction and instances of that transaction are found only in invalid/undecided blocks or the backlog, then the response will be ``404 Not
invalid blocks, then the response will be ``404 Not Found``. Found``.
:param tx_id: transaction ID :param tx_id: transaction ID
:type tx_id: hex string :type tx_id: hex string

23
tests/web/test_transactions.py
View File

@ -270,3 +270,26 @@ def test_transactions_get_list_bad(client):
# Test asset ID required # Test asset ID required
url = TX_ENDPOINT + '?operation=CREATE' url = TX_ENDPOINT + '?operation=CREATE'
assert client.get(url).status_code == 400 assert client.get(url).status_code == 400
def test_return_only_valid_transaction(client):
from bigchaindb import Bigchain
def get_transaction_patched(status):
def inner(self, tx_id, include_status):
return {}, status
return inner
# NOTE: `get_transaction` only returns a transaction if it's included in an
# UNDECIDED or VALID block, as well as transactions from the backlog.
# As the endpoint uses `get_transaction`, we don't have to test
# against invalid transactions here.
with patch('bigchaindb.core.Bigchain.get_transaction',
get_transaction_patched(Bigchain.TX_UNDECIDED)):
url = '{}{}'.format(TX_ENDPOINT, '123')
assert client.get(url).status_code == 404
with patch('bigchaindb.core.Bigchain.get_transaction',
get_transaction_patched(Bigchain.TX_IN_BACKLOG)):
url = '{}{}'.format(TX_ENDPOINT, '123')
assert client.get(url).status_code == 404