Updated data models for 1.0

.travis.yml

@@ -18,7 +18,7 @@ before_install:
       -e BIGCHAINDB_KEYPAIR_PRIVATE=5C5Cknco7YxBRP9AgB1cbUVTL4FAcooxErLygw1DeG2D
       -e BIGCHAINDB_DATABASE_BACKEND=mongodb
       -e BIGCHAINDB_DATABASE_HOST=172.17.0.1
-      bigchaindb/bigchaindb:0.10.2
+      bigchaindb/bigchaindb:master
       start
 
 script: yarn test

package.json

@@ -42,7 +42,7 @@
     "babel-runtime": "^6.22.0",
     "cross-env": "^5.0.1",
     "eslint": "^3.14.1",
-    "eslint-config-ascribe": "^3.0.1",
+    "eslint-config-ascribe": "^3.0.4",
     "eslint-plugin-import": "^2.2.0",
     "husky": "^0.13.4",
     "release-it": "^2.7.3",

src/transaction/makeCreateTransaction.js

@@ -21,6 +21,8 @@ import makeTransaction from './makeTransaction'
  * @returns {object} Unsigned transaction -- make sure to call signTransaction() on it before
  *                   sending it off!
  */
+// TODO: `outputs` should throw or include output in array if no array was
+// passed
 export default function makeCreateTransaction(asset, metadata, outputs, ...issuers) {
     const assetDefinition = {
         'data': asset || null,

src/transaction/makeOutput.js

@@ -3,10 +3,13 @@
  * Create an Output from a Condition.
  * Note: Assumes the given Condition was generated from a single public key (e.g. a Ed25519 Condition)
  * @param {object} condition Condition (e.g. a Ed25519 Condition from `makeEd25519Condition()`)
- * @param {number} amount Amount of the output
+ * @param {string} amount Amount of the output
  * @returns {object} An Output usable in a Transaction
  */
-export default function makeOutput(condition, amount = 1) {
+export default function makeOutput(condition, amount = '1') {
+    if (typeof amount !== 'string') {
+        throw new TypeError('`amount` must be of type string')
+    }
     return {
         'amount': amount,
         condition,

src/transaction/makeTransferTransaction.js

@@ -2,6 +2,32 @@ import makeInputTemplate from './makeInputTemplate'
 import makeTransaction from './makeTransaction'
 
 
+// TODO: Can we remove `export` here somehow, but still be able to import the
+// function for tests?
+export function _makeTransferTransaction(
+        unspentTransaction,
+        metadata,
+        outputs,
+        ...fulfilledOutputs
+    ) {
+    const inputs = fulfilledOutputs.map((outputIndex) => {
+        const fulfilledOutput = unspentTransaction.outputs[outputIndex]
+        const transactionLink = {
+            'output': outputIndex,
+            'transaction_id': unspentTransaction.id,
+        }
+
+        return makeInputTemplate(fulfilledOutput.public_keys, transactionLink)
+    })
+
+    const assetLink = {
+        'id': unspentTransaction.operation === 'CREATE' ? unspentTransaction.id
+                                                        : unspentTransaction.asset.id
+    }
+
+    return ['TRANSFER', assetLink, metadata, outputs, inputs]
+}
+
 /**
  * @public
  * Generate a `TRANSFER` transaction holding the `asset`, `metadata`, and `outputs`, that fulfills
@@ -22,26 +48,12 @@ import makeTransaction from './makeTransaction'
  * @returns {object} Unsigned transaction -- make sure to call signTransaction() on it before
  *                   sending it off!
  */
-export default function makeTransferTransaction(
-        unspentTransaction,
-        metadata,
-        outputs,
-        ...fulfilledOutputs
-    ) {
-    const inputs = fulfilledOutputs.map((outputIndex) => {
-        const fulfilledOutput = unspentTransaction.outputs[outputIndex]
-        const transactionLink = {
-            'output': outputIndex,
-            'txid': unspentTransaction.id,
-        }
-
-        return makeInputTemplate(fulfilledOutput.public_keys, transactionLink)
-    })
-
-    const assetLink = {
-        'id': unspentTransaction.operation === 'CREATE' ? unspentTransaction.id
-                                                        : unspentTransaction.asset.id
-    }
 
-    return makeTransaction('TRANSFER', assetLink, metadata, outputs, inputs)
+// TODO:
+// - Make `metadata` optional argument
+// - Rename `fulfilledOutputs`, e.g. inputs
+// TODO: `outputs` should throw or include output in array if no array was
+// passed
+export default function makeTransferTransaction(...args) {
+    return makeTransaction(..._makeTransferTransaction(...args))
 }

test/transaction/test_transaction.js

@@ -0,0 +1,121 @@
+import test from 'ava'
+import { Transaction, Ed25519Keypair } from '../../src'
+import { _makeTransferTransaction } from '../../src/transaction/makeTransferTransaction'
+import makeInputTemplate from '../../src/transaction/makeInputTemplate'
+
+
+// TODO: Find out if ava has something like conftest, if so put this there.
+const alice = new Ed25519Keypair()
+const aliceCondition = Transaction.makeEd25519Condition(alice.publicKey)
+const aliceOutput = Transaction.makeOutput(aliceCondition)
+const assetMessage = { assetMessage: 'assetMessage' }
+const metaDataMessage = { metaDataMessage: 'metaDataMessage' }
+const createTx = Transaction.makeCreateTransaction(
+    assetMessage,
+    metaDataMessage,
+    [aliceOutput],
+    alice.publicKey
+)
+const transferTx = Transaction.makeTransferTransaction(
+    createTx,
+    metaDataMessage,
+    [aliceOutput],
+    0
+)
+
+
+test('Create valid output with default amount', t => {
+    const condition = {
+        details: {
+            public_key: 'abc'
+        }
+    }
+    const expected = {
+        amount: '1',
+        condition,
+        public_keys: ['abc']
+    }
+    const res = Transaction.makeOutput(condition)
+    t.deepEqual(res, expected)
+})
+
+
+test('Create valid output with custom amount', t => {
+    const condition = {
+        details: {
+            public_key: 'abc'
+        }
+    }
+    const customAmount = '1337'
+    const expected = {
+        amount: customAmount,
+        condition,
+        public_keys: ['abc']
+    }
+    const res = Transaction.makeOutput(condition, customAmount)
+    t.deepEqual(res, expected)
+})
+
+test('Pass condition not based on public_keys to makeOutput', t => {
+    const condition = {
+        details: {
+            idea: 'just pretend this is e.g. a hashlock'
+        }
+    }
+    const expected = {
+        amount: '1',
+        condition,
+        public_keys: []
+    }
+    const res = Transaction.makeOutput(condition)
+    t.deepEqual(res, expected)
+})
+
+
+test('makeOutput throws TypeError with incorrect amount type', t => {
+    t.throws(() => Transaction.makeOutput({}, 1337), TypeError)
+})
+
+
+test('Create TRANSFER transaction based on CREATE transaction', t => {
+    const testTx = _makeTransferTransaction(
+        createTx,
+        metaDataMessage,
+        [aliceOutput],
+        0
+    )
+    const expected = [
+        'TRANSFER',
+        { id: createTx.id },
+        metaDataMessage,
+        [aliceOutput],
+        [makeInputTemplate(
+            [alice.publicKey],
+            { output: 0, transaction_id: createTx.id }
+        )]
+    ]
+
+    t.deepEqual(testTx, expected)
+})
+
+
+test('Create TRANSFER transaction based on TRANSFER transaction', t => {
+    const testTx = _makeTransferTransaction(
+        transferTx,
+        metaDataMessage,
+        [aliceOutput],
+        0
+    )
+    const expected = [
+        'TRANSFER',
+        { id: transferTx.asset.id },
+        metaDataMessage,
+        [aliceOutput],
+        [makeInputTemplate(
+            [alice.publicKey],
+            { output: 0, transaction_id: transferTx.id }
+        )]
+    ]
+
+    t.deepEqual(testTx, expected)
+})