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 + fixed tests for get_owned_ids

Browse Source 
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration

Conflicts:
	bigchaindb/core.py
This commit is contained in:
diminator 2016-04-08 16:08:33 +02:00
commit 7d99bcba7b
No known key found for this signature in database
GPG Key ID: C3D8590E6D0D439A
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigchaindb/core.py
View File

@ -231,15 +231,17 @@ class Bigchain(object):
.filter(lambda tx: tx['transaction']['conditions']
.contains(lambda c: c['new_owners']
.contains(owner))) \
.pluck('id')['id'] \
.run(self.conn)
owned = []
# remove all inputs already spent
for tx_input in list(response):
if not self.get_spent(tx_input):
owned.append(tx_input)
for tx in response:
tx_input = {'txid': tx['id']}
for condition in tx['transaction']['conditions']:
if owner in condition['new_owners']:
tx_input.update({'cid': condition['cid']})
# check if input was already spent
if not self.get_spent(tx_input):
owned.append(tx_input)
return owned

32
tests/db/test_bigchain_api.py
View File

@ -34,9 +34,9 @@ class TestBigchainApi(object):
@pytest.mark.usefixtures('inputs')
def test_create_transaction_transfer(self, b, user_vk, user_sk):
input_tx = b.get_owned_ids(user_vk).pop()
assert b.verify_signature(b.get_transaction(input_tx)) == True
assert b.verify_signature(b.get_transaction(input_tx['txid'])) == True
tx = b.create_transaction(b.me, user_sk, {'txid': input_tx, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(b.me, user_sk, input_tx, 'TRANSFER')
assert sorted(tx) == sorted(['id', 'transaction', 'version'])
assert sorted(tx['transaction']) == sorted(['conditions', 'data', 'fulfillments', 'operation', 'timestamp'])
@ -79,7 +79,7 @@ class TestBigchainApi(object):
@pytest.mark.usefixtures('inputs')
def test_write_transaction(self, b, user_vk, user_sk):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(user_vk, user_vk, {'txid': input_tx, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(user_vk, user_vk, input_tx, 'TRANSFER')
tx_signed = b.sign_transaction(tx, user_sk)
response = b.write_transaction(tx_signed)
@ -93,7 +93,7 @@ class TestBigchainApi(object):
@pytest.mark.usefixtures('inputs')
def test_read_transaction(self, b, user_vk, user_sk):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(user_vk, user_vk, {'txid': input_tx, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(user_vk, user_vk, input_tx, 'TRANSFER')
tx_signed = b.sign_transaction(tx, user_sk)
b.write_transaction(tx_signed)
@ -107,7 +107,7 @@ class TestBigchainApi(object):
@pytest.mark.usefixtures('inputs')
def test_assign_transaction_one_node(self, b, user_vk, user_sk):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(user_vk, user_vk, {'txid': input_tx, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(user_vk, user_vk, input_tx, 'TRANSFER')
tx_signed = b.sign_transaction(tx, user_sk)
b.write_transaction(tx_signed)
@ -126,7 +126,7 @@ class TestBigchainApi(object):
# test assignee for several transactions
for _ in range(20):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(user_vk, user_vk, {'txid': input_tx, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(user_vk, user_vk, input_tx, 'TRANSFER')
tx_signed = b.sign_transaction(tx, user_sk)
b.write_transaction(tx_signed)
@ -240,7 +240,7 @@ class TestTransactionValidation(object):
@pytest.mark.usefixtures('inputs')
def test_create_operation_with_inputs(self, b, user_vk):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.create_transaction(b.me, user_vk, {'txid': input_tx, 'cid': 0}, 'CREATE')
tx = b.create_transaction(b.me, user_vk, input_tx, 'CREATE')
with pytest.raises(ValueError) as excinfo:
b.validate_transaction(tx)
@ -275,7 +275,7 @@ class TestTransactionValidation(object):
def test_non_create_valid_input_wrong_owner(self, b, user_vk):
input_valid = b.get_owned_ids(user_vk).pop()
sk, vk = crypto.generate_key_pair()
tx = b.create_transaction(vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx = b.create_transaction(vk, user_vk, input_valid, 'TRANSFER')
with pytest.raises(exceptions.InvalidSignature) as excinfo:
b.validate_transaction(tx)
@ -285,7 +285,7 @@ class TestTransactionValidation(object):
@pytest.mark.usefixtures('inputs')
def test_non_create_double_spend(self, b, user_vk, user_sk):
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
tx_valid_signed = b.sign_transaction(tx_valid, user_sk)
b.write_transaction(tx_valid_signed)
@ -294,17 +294,17 @@ class TestTransactionValidation(object):
b.write_block(block, durability='hard')
# create another transaction with the same input
tx_double_spend = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_double_spend = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
with pytest.raises(exceptions.DoubleSpend) as excinfo:
b.validate_transaction(tx_double_spend)
assert excinfo.value.args[0] == 'input `{}` was already spent'.format({'txid': input_valid, 'cid': 0})
assert excinfo.value.args[0] == 'input `{}` was already spent'.format(input_valid)
assert b.is_valid_transaction(tx_double_spend) is False
@pytest.mark.usefixtures('inputs')
def test_wrong_transaction_hash(self, b, user_vk):
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
# change the transaction hash
tx_valid.update({'id': 'abcd'})
@ -315,7 +315,7 @@ class TestTransactionValidation(object):
@pytest.mark.usefixtures('inputs')
def test_wrong_signature(self, b, user_vk):
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
wrong_private_key = '4fyvJe1aw2qHZ4UNRYftXK7JU7zy9bCqoU5ps6Ne3xrY'
@ -333,7 +333,7 @@ class TestTransactionValidation(object):
@pytest.mark.usefixtures('inputs')
def test_valid_non_create_transaction(self, b, user_vk, user_sk):
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
tx_valid_signed = b.sign_transaction(tx_valid, user_sk)
assert tx_valid_signed == b.validate_transaction(tx_valid_signed)
@ -342,7 +342,7 @@ class TestTransactionValidation(object):
@pytest.mark.usefixtures('inputs')
def test_valid_non_create_transaction_after_block_creation(self, b, user_vk, user_sk):
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
tx_valid_signed = b.sign_transaction(tx_valid, user_sk)
assert tx_valid_signed == b.validate_transaction(tx_valid_signed)
@ -412,7 +412,7 @@ class TestBlockValidation(object):
def test_valid_block(self, b, user_vk, user_sk):
# create valid transaction
input_valid = b.get_owned_ids(user_vk).pop()
tx_valid = b.create_transaction(user_vk, user_vk, {'txid': input_valid, 'cid': 0}, 'TRANSFER')
tx_valid = b.create_transaction(user_vk, user_vk, input_valid, 'TRANSFER')
tx_valid_signed = b.sign_transaction(tx_valid, user_sk)
# create valid block

6
tests/web/test_basic_views.py
View File

@ -11,8 +11,8 @@ TX_ENDPOINT = '/api/v1/transactions/'
@pytest.mark.usefixtures('inputs')
def test_get_transaction_endpoint(b, client, user_vk):
input_tx = b.get_owned_ids(user_vk).pop()
tx = b.get_transaction(input_tx)
res = client.get(TX_ENDPOINT + input_tx)
tx = b.get_transaction(input_tx['txid'])
res = client.get(TX_ENDPOINT + input_tx['txid'])
assert tx == res.json
@ -31,7 +31,7 @@ def test_post_transfer_transaction_endpoint(b, client, user_vk, user_sk):
to_keypair = crypto.generate_key_pair()
input_valid = b.get_owned_ids(user_vk).pop()
transfer = util.create_and_sign_tx(user_sk, user_vk, to_keypair[1], {'txid': input_valid, 'cid': 0})
transfer = util.create_and_sign_tx(user_sk, user_vk, to_keypair[1], input_valid)
res = client.post(TX_ENDPOINT, data=json.dumps(transfer))
assert res.json['transaction']['fulfillments'][0]['current_owners'][0] == user_vk