Merge branch 'master' of https://github.com/eladve/bigchaindb into eladve-master

bigchaindb/util.py

@@ -169,8 +169,8 @@ def create_tx(current_owners, new_owners, inputs, operation, payload=None):
     Reference:
         {
             "id": "<sha3 hash>",
-            "version": "transaction version number",
             "transaction": {
+                "version": "transaction version number",
                 "fulfillments": [
                         {
                             "current_owners": ["list of <pub-keys>"],
@@ -278,6 +278,7 @@ def create_tx(current_owners, new_owners, inputs, operation, payload=None):
             })
 
     tx = {
+        'version': 1,
         'fulfillments': fulfillments,
         'conditions': conditions,
         'operation': operation,
@@ -291,7 +292,6 @@ def create_tx(current_owners, new_owners, inputs, operation, payload=None):
     # create the transaction
     transaction = {
         'id': tx_hash,
-        'version': 1,
         'transaction': tx
     }
 
@@ -479,7 +479,7 @@ def get_fulfillment_message(transaction, fulfillment, serialized=False):
         'operation': transaction['transaction']['operation'],
         'timestamp': transaction['transaction']['timestamp'],
         'data': transaction['transaction']['data'],
-        'version': transaction['version'],
+        'version': transaction['transaction']['version'],
         'id': transaction['id']
     }
     # and the condition which needs to be retrieved from the output of a previous transaction

docs/source/topic-guides/models.md

@@ -58,8 +58,8 @@ Assets can be mutable (changeable) or immutable. To change a mutable asset, you
 ```json
 {
     "id": "<hash of transaction, excluding signatures (see explanation)>",
-    "version": "<version number of the transaction model>",
     "transaction": {
+        "version": "<version number of the transaction model>",
         "fulfillments": ["<list of fulfillments>"],
         "conditions": ["<list of conditions>"],
         "operation": "<string>",
@@ -75,8 +75,8 @@ Assets can be mutable (changeable) or immutable. To change a mutable asset, you
 Here's some explanation of the contents of a transaction:
 
 - `id`: The hash of everything inside the serialized `transaction` body (i.e. `fulfillments`, `conditions`, `operation`, `timestamp` and `data`; see below), with one wrinkle: for each fulfillment in `fulfillments`, `fulfillment` is set to `null`. The `id` is also the database primary key.
-- `version`: Version number of the transaction model, so that software can support different transaction models.
 - `transaction`:
+    - `version`: Version number of the transaction model, so that software can support different transaction models.
     - `fulfillments`: List of fulfillments. Each _fulfillment_ contains a pointer to an unspent asset
     and a _crypto fulfillment_ that satisfies a spending condition set on the unspent asset. A _fulfillment_
     is usually a signature proving the ownership of the asset.

tests/db/test_bigchain_api.py

@@ -38,8 +38,8 @@ class TestBigchainApi(object):
     def test_create_transaction_create(self, b, user_sk):
         tx = b.create_transaction(b.me, user_sk, None, 'CREATE')
 
-        assert sorted(tx) == ['id', 'transaction', 'version']
-        assert sorted(tx['transaction']) == ['conditions', 'data', 'fulfillments', 'operation', 'timestamp']
+        assert sorted(tx) == ['id', 'transaction']
+        assert sorted(tx['transaction']) == ['conditions', 'data', 'fulfillments', 'operation', 'timestamp', 'version']
 
     def test_create_transaction_with_unsupported_payload_raises(self, b):
         with pytest.raises(TypeError):
@@ -79,8 +79,8 @@ class TestBigchainApi(object):
 
         tx = b.create_transaction(user_vk, b.me, input_tx, 'TRANSFER')
 
-        assert sorted(tx) == ['id', 'transaction', 'version']
-        assert sorted(tx['transaction']) == ['conditions', 'data', 'fulfillments', 'operation', 'timestamp']
+        assert sorted(tx) == ['id', 'transaction']
+        assert sorted(tx['transaction']) == ['conditions', 'data', 'fulfillments', 'operation', 'timestamp', 'version']
 
         tx_signed = b.sign_transaction(tx, user_sk)
 
@@ -1169,7 +1169,7 @@ class TestFulfillmentMessage(object):
         assert fulfillment_message['fulfillment']['input'] == original_fulfillment['input']
         assert fulfillment_message['operation'] == tx['transaction']['operation']
         assert fulfillment_message['timestamp'] == tx['transaction']['timestamp']
-        assert fulfillment_message['version'] == tx['version']
+        assert fulfillment_message['version'] == tx['transaction']['version']
 
     @pytest.mark.usefixtures('inputs')
     def test_fulfillment_message_transfer(self, b, user_vk):
@@ -1192,7 +1192,7 @@ class TestFulfillmentMessage(object):
         assert fulfillment_message['fulfillment']['input'] == original_fulfillment['input']
         assert fulfillment_message['operation'] == tx['transaction']['operation']
         assert fulfillment_message['timestamp'] == tx['transaction']['timestamp']
-        assert fulfillment_message['version'] == tx['version']
+        assert fulfillment_message['version'] == tx['transaction']['version']
 
     def test_fulfillment_message_multiple_current_owners_multiple_new_owners_multiple_inputs(self, b, user_vk):
         # create a new users
@@ -1230,7 +1230,7 @@ class TestFulfillmentMessage(object):
             assert fulfillment_message['fulfillment']['input'] == original_fulfillment['input']
             assert fulfillment_message['operation'] == tx['transaction']['operation']
             assert fulfillment_message['timestamp'] == tx['transaction']['timestamp']
-            assert fulfillment_message['version'] == tx['version']
+            assert fulfillment_message['version'] == tx['transaction']['version']
 
 
 class TestTransactionMalleability(object):
@@ -1252,7 +1252,7 @@ class TestTransactionMalleability(object):
         assert b.is_valid_transaction(tx_changed) is False
 
         tx_changed = copy.deepcopy(tx_signed)
-        tx_changed['version'] = '0'
+        tx_changed['transaction']['version'] = '0'
         assert b.validate_fulfillments(tx_changed) is False
         assert b.is_valid_transaction(tx_changed) is False
 

tests/test_util.py

@@ -151,7 +151,7 @@ def test_create_tx_with_empty_inputs():
     tx = create_tx(None, None, [], None)
     assert 'id' in tx
     assert 'transaction' in tx
-    assert 'version' in tx
+    assert 'version' in tx['transaction']
     assert 'fulfillments' in tx['transaction']
     assert 'conditions' in tx['transaction']
     assert 'operation' in tx['transaction']