From f018a4f6e7f4e1736c3f9588e30b1183be3f236b Mon Sep 17 00:00:00 2001 From: diminator Date: Thu, 12 Jan 2017 10:06:48 +0100 Subject: [PATCH] replace status strings by Bigchain attributes --- bigchaindb/web/views/blocks.py | 4 +++- tests/web/test_blocks.py | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bigchaindb/web/views/blocks.py b/bigchaindb/web/views/blocks.py index fc6a7566..6f63b5d7 100644 --- a/bigchaindb/web/views/blocks.py +++ b/bigchaindb/web/views/blocks.py @@ -7,6 +7,7 @@ For more information please refer to the documentation on ReadTheDocs: from flask import current_app from flask_restful import Resource, reqparse +from bigchaindb import Bigchain from bigchaindb.web.views.base import make_error @@ -42,7 +43,8 @@ class BlockListApi(Resource): """ parser = reqparse.RequestParser() parser.add_argument('tx_id', type=str, required=True) - parser.add_argument('status', type=str, choices=['valid', 'invalid', 'undecided']) + parser.add_argument('status', type=str, + choices=[Bigchain.BLOCK_VALID, Bigchain.BLOCK_INVALID, Bigchain.BLOCK_UNDECIDED]) args = parser.parse_args(strict=True) tx_id = args['tx_id'] diff --git a/tests/web/test_blocks.py b/tests/web/test_blocks.py index cab50cce..81bc80c3 100644 --- a/tests/web/test_blocks.py +++ b/tests/web/test_blocks.py @@ -81,6 +81,8 @@ def test_get_blocks_by_txid_endpoint(b, client): @pytest.mark.bdb @pytest.mark.usefixtures('inputs') def test_get_blocks_by_txid_and_status_endpoint(b, client): + from bigchaindb import Bigchain + tx = Transaction.create([b.me], [([b.me], 1)]) tx = tx.sign([b.me_private]) @@ -98,13 +100,13 @@ def test_get_blocks_by_txid_and_status_endpoint(b, client): block_valid = b.create_block([tx, tx2]) b.write_block(block_valid) - res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, 'invalid')) + res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, Bigchain.BLOCK_INVALID)) # test if block is retrieved as invalid assert res.status_code == 200 assert block_invalid.id in res.json assert len(res.json) == 1 - res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, 'undecided')) + res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, Bigchain.BLOCK_UNDECIDED)) # test if block is retrieved as undecided assert res.status_code == 200 assert block_valid.id in res.json @@ -114,7 +116,7 @@ def test_get_blocks_by_txid_and_status_endpoint(b, client): vote = b.vote(block_valid.id, block_invalid.id, True) b.write_vote(vote) - res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, 'valid')) + res = client.get("{}?tx_id={}&status={}".format(BLOCKS_ENDPOINT, tx.id, Bigchain.BLOCK_VALID)) # test if block is retrieved as valid assert res.status_code == 200 assert block_valid.id in res.json @@ -153,4 +155,3 @@ def test_get_blocks_by_txid_endpoint_returns_400_bad_query_params(client): 'status': '123 is not a valid choice' } } -