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

optional tuple response instead of altering DB object

Browse Source
This commit is contained in:
diminator 2016-08-22 12:19:06 +02:00
parent 1a174b54dc
commit d8df478925
No known key found for this signature in database
GPG Key ID: C3D8590E6D0D439A
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigchaindb/core.py
View File

@ -137,7 +137,7 @@ class Bigchain(object):
response = r.table('backlog').insert(signed_transaction, durability=durability).run(self.conn) response = r.table('backlog').insert(signed_transaction, durability=durability).run(self.conn)
return response return response
def get_transaction(self, txid): def get_transaction(self, txid, include_status=False):
"""Retrieve a transaction with `txid` from bigchain. """Retrieve a transaction with `txid` from bigchain.
Queries the bigchain for a transaction, if it's in a valid or invalid Queries the bigchain for a transaction, if it's in a valid or invalid
@ -153,14 +153,15 @@ class Bigchain(object):
returns `None` returns `None`
""" """
response, tx_status = None, None
validity = self.get_blocks_status_containing_tx(txid) validity = self.get_blocks_status_containing_tx(txid)
if validity: if validity:
# Disregard invalid blocks, and return if there are no valid or undecided blocks # Disregard invalid blocks, and return if there are no valid or undecided blocks
validity = {_id: status for _id, status in validity.items() validity = {_id: status for _id, status in validity.items()
if status != Bigchain.BLOCK_INVALID} if status != Bigchain.BLOCK_INVALID}
if not validity: if validity:
return None
# If the transaction is in a valid or any undecided block, return it. Does not check # If the transaction is in a valid or any undecided block, return it. Does not check
# if transactions in undecided blocks are consistent, but selects the valid block before # if transactions in undecided blocks are consistent, but selects the valid block before
@ -177,14 +178,15 @@ class Bigchain(object):
response = r.table('bigchain', read_mode=self.read_mode).get(target_block_id)\ response = r.table('bigchain', read_mode=self.read_mode).get(target_block_id)\
.get_field('block').get_field('transactions')\ .get_field('block').get_field('transactions')\
.filter(lambda tx: tx['id'] == txid).run(self.conn)[0] .filter(lambda tx: tx['id'] == txid).run(self.conn)[0]
response['validity'] = tx_status
return response
else: else:
# Otherwise, check the backlog # Otherwise, check the backlog
response = r.table('backlog').get(txid).run(self.conn) response = r.table('backlog').get(txid).run(self.conn)
if response: if response:
response['validity'] = self.TX_IN_BACKLOG tx_status = self.TX_IN_BACKLOG
if include_status:
return response, tx_status
else:
return response return response
def search_block_election_on_index(self, value, index): def search_block_election_on_index(self, value, index):

12
tests/db/test_bigchain_api.py
View File

@ -120,10 +120,10 @@ class TestBigchainApi(object):
block = b.create_block([tx_signed]) block = b.create_block([tx_signed])
b.write_block(block, durability='hard') b.write_block(block, durability='hard')
response = b.get_transaction(tx_signed["id"]) response, status = b.get_transaction(tx_signed["id"], include_status=True)
# add validity information, which will be returned # add validity information, which will be returned
tx_signed['validity'] = 'undecided'
assert util.serialize(tx_signed) == util.serialize(response) assert util.serialize(tx_signed) == util.serialize(response)
assert status == 'undecided'
@pytest.mark.usefixtures('inputs') @pytest.mark.usefixtures('inputs')
def test_read_transaction_backlog(self, b, user_vk, user_sk): def test_read_transaction_backlog(self, b, user_vk, user_sk):
@ -132,10 +132,10 @@ class TestBigchainApi(object):
tx_signed = b.sign_transaction(tx, user_sk) tx_signed = b.sign_transaction(tx, user_sk)
b.write_transaction(tx_signed) b.write_transaction(tx_signed)
response = b.get_transaction(tx_signed["id"]) response, status = b.get_transaction(tx_signed["id"], include_status=True)
# add validity information, which will be returned # add validity information, which will be returned
tx_signed['validity'] = 'backlog'
assert util.serialize(tx_signed) == util.serialize(response) assert util.serialize(tx_signed) == util.serialize(response)
assert status == 'backlog'
@pytest.mark.usefixtures('inputs') @pytest.mark.usefixtures('inputs')
def test_read_transaction_invalid_block(self, b, user_vk, user_sk): def test_read_transaction_invalid_block(self, b, user_vk, user_sk):
@ -171,10 +171,10 @@ class TestBigchainApi(object):
vote = b.vote(block['id'], b.get_last_voted_block()['id'], True) vote = b.vote(block['id'], b.get_last_voted_block()['id'], True)
b.write_vote(vote) b.write_vote(vote)
response = b.get_transaction(tx_signed["id"]) response, status = b.get_transaction(tx_signed["id"], include_status=True)
# add validity information, which will be returned # add validity information, which will be returned
tx_signed['validity'] = 'valid'
assert util.serialize(tx_signed) == util.serialize(response) assert util.serialize(tx_signed) == util.serialize(response)
assert status == 'valid'
@pytest.mark.usefixtures('inputs') @pytest.mark.usefixtures('inputs')
def test_assign_transaction_one_node(self, b, user_vk, user_sk): def test_assign_transaction_one_node(self, b, user_vk, user_sk):