Merge pull request #72 from bigchaindb/test-combine

Test combine PRs

.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:1.0.0rc1
+      bigchaindb/bigchaindb:master
       start
     - gem install cowsay
     - npm install -g codecov

src/transaction/makeOutput.js

@@ -17,7 +17,7 @@ export default function makeOutput(condition, amount = '1') {
                 publicKeys.push(details.public_key)
             }
         } else if (details.type === 'threshold-sha-256') {
-            details.subfulfillments.map(getPublicKeys)
+            details.subconditions.map(getPublicKeys)
         }
     }
     getPublicKeys(condition.details)

src/transaction/makeTransferTransaction.js

@@ -33,7 +33,7 @@ export default function makeTransferTransaction(
     const inputs = outputIndices.map((outputIndex) => {
         const fulfilledOutput = unspentTransaction.outputs[outputIndex]
         const transactionLink = {
-            'output': outputIndex,
+            'output_index': outputIndex,
             'transaction_id': unspentTransaction.id,
         }
 

src/transaction/utils/ccJsonLoad.js

@@ -22,12 +22,12 @@ export default function ccJsonLoad(conditionJson) {
         if (conditionJson.type === 'threshold-sha-256') {
             fulfillment = new cc.ThresholdSha256()
             fulfillment.threshold = conditionJson.threshold
-            conditionJson.subfulfillments.forEach((subfulfillmentJson) => {
-                const subfulfillment = ccJsonLoad(subfulfillmentJson)
-                if ('getConditionUri' in subfulfillment) {
-                    fulfillment.addSubfulfillment(subfulfillment)
-                } else if ('serializeUri' in subfulfillment) {
-                    fulfillment.addSubcondition(subfulfillment)
+            conditionJson.subconditions.forEach((subconditionJson) => {
+                const subcondition = ccJsonLoad(subconditionJson)
+                if ('getConditionUri' in subcondition) {
+                    fulfillment.addSubfulfillment(subcondition)
+                } else if ('serializeUri' in subcondition) {
+                    fulfillment.addSubcondition(subcondition)
                 }
             })
         }
@@ -35,9 +35,6 @@ export default function ccJsonLoad(conditionJson) {
         if (conditionJson.type === 'ed25519-sha-256') {
             fulfillment = new cc.Ed25519Sha256()
             fulfillment.publicKey = new Buffer(base58.decode(conditionJson.public_key))
-            if (conditionJson.signature) {
-                fulfillment.signature = new Buffer(base58.decode(conditionJson.signature))
-            }
         }
         return fulfillment
     }

src/transaction/utils/ccJsonify.js

@@ -35,7 +35,7 @@ export default function ccJsonify(fulfillment) {
             'details': {
                 'type': 'threshold-sha-256',
                 'threshold': fulfillment.threshold,
-                'subfulfillments': fulfillment.subconditions.map((subcondition) => {
+                'subconditions': fulfillment.subconditions.map((subcondition) => {
                     const subconditionJson = ccJsonify(subcondition.body)
                     return subconditionJson.details
                 })
@@ -48,7 +48,6 @@ export default function ccJsonify(fulfillment) {
         jsonBody.details.type = 'ed25519-sha-256'
 
         if ('publicKey' in fulfillment) {
-            jsonBody.details.signature = null
             jsonBody.details.public_key = base58.encode(fulfillment.publicKey)
         }
     }

test/transaction/test_cryptoconditions.js

@@ -9,7 +9,6 @@ test('Ed25519 condition encoding', t => {
         details: {
             type: 'ed25519-sha-256',
             public_key: publicKey,
-            signature: null,
         },
         uri: 'ni:///sha-256;uLdVX7FEjLWVDkAkfMAkEqPPwFqZj7qfiGE152t_x5c?fpt=ed25519-sha-256&cost=131072'
     }
@@ -28,16 +27,14 @@ test('Threshold condition encoding', t => {
             details: {
                 type: 'threshold-sha-256',
                 threshold: 1,
-                subfulfillments: [
+                subconditions: [
                     {
                         type: 'ed25519-sha-256',
                         public_key: publicKey,
-                        signature: null,
                     },
                     {
                         type: 'ed25519-sha-256',
                         public_key: publicKey,
-                        signature: null,
                     }
                 ]
             },
@@ -70,3 +67,19 @@ test('Fulfillment correctly formed', t => {
                                     txCreate.outputs[0].condition.uri,
                                     new Buffer(msg)))
 })
+
+
+test('CryptoConditions JSON load', t => {
+    const cond = Transaction.ccJsonLoad({
+        type: 'threshold-sha-256',
+        threshold: 1,
+        subconditions: [{
+            type: 'ed25519-sha-256',
+            public_key: 'a'
+        },
+        {
+            hash: 'a'
+        }],
+    })
+    t.truthy(cond.subconditions.length === 2)
+})

test/transaction/test_transaction.js

@@ -85,7 +85,7 @@ test('Create TRANSFER transaction based on CREATE transaction', t => {
         [aliceOutput],
         [makeInputTemplate(
             [alice.publicKey],
-            { output: 0, transaction_id: createTx.id }
+            { output_index: 0, transaction_id: createTx.id }
         )]
     ]
 
@@ -113,7 +113,7 @@ test('Create TRANSFER transaction based on TRANSFER transaction', t => {
         [aliceOutput],
         [makeInputTemplate(
             [alice.publicKey],
-            { output: 0, transaction_id: transferTx.id }
+            { output_index: 0, transaction_id: transferTx.id }
         )]
     ]