bigchaindb
/
bigchaindb
mirror of https://github.com/bigchaindb/bigchaindb.git
1
0
Fork 0
Code Releases Activity

Small change to the asset template in TRANSFER transactions. 

This change is so that both `CREATE` and `TRANSFER` transactions have
the uuid under the same key so that we can create secondary indexes on
it.
This commit is contained in:
Rodolphe Marques 2016-08-24 16:12:21 +02:00 committed by tim
parent 0189ede72e
commit f10d1d0bcb
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigchaindb/assets.py
View File

@ -25,10 +25,7 @@ def get_asset_id(txids, bigchain):
tx = bigchain.get_transaction(txid)
if tx is None:
raise TransactionDoesNotExist('Transaction with txid `{}` does not exist in the bigchain'.format(txid))
if tx['transaction']['operation'] == 'CREATE':
asset_ids.append(tx['transaction']['asset']['id'])
else:
asset_ids.append(tx['transaction']['asset'])
asset_ids.append(tx['transaction']['asset']['id'])
asset_ids = set(asset_ids)
if len(asset_ids) > 1:

6
tests/assets/test_digital_assets.py
View File

@ -23,7 +23,7 @@ def test_asset_transfer(b, user_vk, user_sk):
tx_transfer_signed = b.sign_transaction(tx_transfer, user_sk)
assert b.validate_transaction(tx_transfer_signed) == tx_transfer_signed
assert tx_transfer_signed['transaction']['asset'] == tx_create['transaction']['asset']['id']
assert tx_transfer_signed['transaction']['asset']['id'] == tx_create['transaction']['asset']['id']
def test_validate_bad_asset_creation(b, user_vk):
@ -88,7 +88,7 @@ def test_validate_bad_asset_transfer(b, user_vk, user_sk):
tx_input = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(user_vk, user_vk, tx_input, 'TRANFER')
tx['transaction']['asset'] = 'aaa'
tx['transaction']['asset']['id'] = 'aaa'
tx['id'] = get_hash_data(tx['transaction'])
tx_signed = b.sign_transaction(tx, user_sk)
with pytest.raises(AssetIdMismatch):
@ -141,7 +141,7 @@ def test_get_asset_id_transfer_transaction(b, user_vk, user_sk):
b.write_vote(vote)
asset_id = get_asset_id(tx_transfer['id'], bigchain=b)
assert asset_id == tx_transfer['transaction']['asset']
assert asset_id == tx_transfer['transaction']['asset']['id']
@pytest.mark.usefixtures('inputs')