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 remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration

Browse Source
This commit is contained in:
diminator 2016-04-12 13:41:26 +02:00
commit 923740ee6c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/core.py
View File

@ -147,7 +147,7 @@ class Bigchain(object):
If no transaction with that `txid` was found it returns `None` If no transaction with that `txid` was found it returns `None`
""" """
response = r.table('bigchain').concat_map(lambda doc: doc['block']['transactions']) \ response = r.table('bigchain').concat_map(lambda doc: doc['block']['transactions'])\
.filter(lambda transaction: transaction['id'] == txid).run(self.conn) .filter(lambda transaction: transaction['id'] == txid).run(self.conn)
# transaction ids should be unique # transaction ids should be unique

13
tests/db/test_bigchain_api.py
View File

@ -745,15 +745,24 @@ class TestBigchainBlock(object):
class TestMultipleInputs(object): class TestMultipleInputs(object):
def test_transfer_transaction_multiple(self, b): def test_transfer_single_owners_single_input(self, b):
pass pass
def test_transfer_single_input_from_multi_input(self, b): def test_transfer_single_owners_multiple_inputs(self, b):
pass
def test_transfer_single_owners_single_input_from_multiple_outputs(self, b):
pass
def test_multiple_owners(self, b):
pass pass
def test_get_spent(self, b): def test_get_spent(self, b):
pass pass
def test_get_owned_ids(self, b):
pass
class TestCryptoconditions(object): class TestCryptoconditions(object):
def test_fulfillment_transaction_create(self, b, user_vk): def test_fulfillment_transaction_create(self, b, user_vk):