Updated data models for 1.0 #35

TimDaub · 2017-06-16T12:54:20Z

So far:

change fulfills.txid to `transaction_id
stringify outputs amount
wrote tests for makeOutput

TODO:

test makeTransferTransaction

@vrde: Should we mimick the folder structure of src in test?
For file structure, I think everything in src/transaction should be combined into one class as we did with src/connection, hence only one test file called test_transaction.js.

TimDaub · 2017-06-16T12:56:29Z

src/transaction/makeOutput.js

@@ -8,7 +8,7 @@
 */
 export default function makeOutput(condition, amount = 1) {
    return {
-        'amount': amount.toString(),
+        'amount': amount,


Instead of stringifying, strings have to be passed directly now.

vrde · 2017-06-16T13:52:28Z

@vrde: Should we mimick the folder structure of src in test?

Yep.

For file structure, I think everything in src/transaction should be combined into one class as we did with src/connection, hence only one test file called test_transaction.js.

Agree.

For now I've just added a simple integration test that pushes a transaction to BigchainDB, do you want to extend the test suite in this PR? Maybe we can add more "simple" integration tests for now, and then work on the unit test, what do you think?

TimDaub · 2017-06-19T11:47:35Z

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(


I just noticed that I should maybe not do this whole private function thing.
I did it initially for testing, however I should use mocks.

If someone knows how to mock a export default function, let me know and I can change this.

ssadler · 2017-06-20T10:44:04Z

.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


I'm guessing we want to change this to 1.0.0rc1 at some point

ssadler · 2017-06-20T10:44:29Z

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


What's this

What do you mean specifically? L25 or the L24-25 comment?

Remove TODO

ssadler · 2017-06-20T10:47:42Z

src/transaction/makeTransferTransaction.js

+    })
+
+    const assetLink = {
+        'id': unspentTransaction.operation === 'CREATE' ? unspentTransaction.id


It might be nice to have a function getAssetId(transaction) somewhere.

ssadler · 2017-06-20T10:48:04Z

src/transaction/makeTransferTransaction.js


-    return makeTransaction('TRANSFER', assetLink, metadata, outputs, inputs)
+// TODO:


TODOs in master?

ssadler · 2017-06-20T10:52:20Z

test/transaction/test_transaction.js

+        public_keys: []
+    }
+    const res = Transaction.makeOutput(condition)
+    return t.deepEqual(res, expected)


not sure the return is needed here

ssadler · 2017-06-20T10:52:31Z

test/transaction/test_transaction.js

+        public_keys: ['abc']
+    }
+    const res = Transaction.makeOutput(condition)
+    return t.deepEqual(res, expected)


not sure return is needed

I don't think it is. Thx. I'll fix, also here

TimDaub · 2017-06-20T11:56:03Z

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(


@libscott and I created: #44

TimDaub · 2017-06-20T11:56:37Z

src/transaction/makeTransferTransaction.js

+        unspentTransaction,
+        metadata,
+        outputs,
+        ...fulfilledOutputs


rename to: outputIndexes

TimDaub · 2017-06-20T12:00:28Z

test/transaction/test_transaction.js

+
+
+// TODO: Find out if ava has something like conftest, if so put this there.
+const alice = new Ed25519Keypair()


Use output of respective functions as strings/dicts here

Created an issue: #45

TimDaub commented Jun 16, 2017

View reviewed changes

TimDaub changed the title ~~[WIP] 1.0 rc compatiblity~~ [WIP] Updated data models for 1.0 Jun 19, 2017

TimDaub commented Jun 19, 2017

View reviewed changes

TimDaub mentioned this pull request Jun 19, 2017

Http api 1.0 rc changes #39

Merged

2 tasks

tim added 7 commits June 20, 2017 11:04

fulfills.txid ==> fulfills.transaction_id

0ed3aa3

Stringify output.amount

27d8dab

Add tests for makeOutput

a14dbba

fulfills.txid => fulfills.transaction_id + tests

b824158

Bump ascribe-eslint-config

ed18384

Use rest params in fn definition

9183205

Test against BDB:master

3389726

TimDaub force-pushed the 1.0-rc-compatiblity branch from 46d8e61 to 3389726 Compare June 20, 2017 09:05

TimDaub changed the title ~~[WIP] Updated data models for 1.0~~ Updated data models for 1.0 Jun 20, 2017

TimDaub requested review from vrde and ssadler June 20, 2017 09:58

ssadler reviewed Jun 20, 2017

View reviewed changes

Remove unnecessary returns

ac0a124

TimDaub commented Jun 20, 2017

View reviewed changes

tim added 2 commits June 20, 2017 14:14

Add sinon.js (mocks) to package.json

42b4002

Correct mocking of export default

ede11da

ssadler approved these changes Jun 20, 2017

View reviewed changes

TimDaub merged commit 0d284c7 into master Jun 20, 2017

kremalicious deleted the 1.0-rc-compatiblity branch June 20, 2017 15:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated data models for 1.0 #35

Updated data models for 1.0 #35

TimDaub commented Jun 16, 2017 •

edited

Loading

TimDaub Jun 16, 2017

vrde commented Jun 16, 2017

TimDaub Jun 19, 2017

TimDaub Jun 19, 2017

ssadler Jun 20, 2017

TimDaub Jun 20, 2017

ssadler Jun 20, 2017

TimDaub Jun 20, 2017

TimDaub Jun 20, 2017

ssadler Jun 20, 2017

ssadler Jun 20, 2017

ssadler Jun 20, 2017

ssadler Jun 20, 2017

TimDaub Jun 20, 2017

TimDaub Jun 20, 2017

TimDaub Jun 20, 2017

TimDaub Jun 20, 2017

TimDaub Jun 20, 2017


		return makeTransaction('TRANSFER', assetLink, metadata, outputs, inputs)
		// TODO:



		// TODO: Find out if ava has something like conftest, if so put this there.
		const alice = new Ed25519Keypair()

Updated data models for 1.0 #35

Updated data models for 1.0 #35

Conversation

TimDaub commented Jun 16, 2017 • edited Loading

Choose a reason for hiding this comment

vrde commented Jun 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TimDaub commented Jun 16, 2017 •

edited

Loading