1798 Commits

Author SHA1 Message Date
tim
e99930c501 web/test_basic_views --> web/test_transactions 2016-11-15 11:54:20 +01:00
Troy McConaghy
061ec0aecc Merge pull request #800 from bigchaindb/add-release-process-md-file
Created a file to outline our release process
2016-11-14 19:15:55 +01:00
Troy McConaghy
196f11098b Added note about running flake8 2016-11-14 18:54:50 +01:00
Troy McConaghy
16fbb47f02 Merge pull request #765 from bigchaindb/clarify-code-from-pr-629
Rename FulfillmentNotInValidBlock to TransactionNotInValidBlock
2016-11-14 18:53:50 +01:00
troymc
d577bf8a51 Fixed two flake8 errors 2016-11-14 18:46:03 +01:00
troymc
54f0d85cda Merged master branch and fixed some merge conflicts 2016-11-14 18:35:46 +01:00
Sylvain Bellemare
ca2cf8d82a Merge pull request #794 from bigchaindb/divisible-assets
Divisible assets
2016-11-14 16:52:59 +01:00
Sylvain Bellemare
6724e64cca Update test to divisible asset change 2016-11-14 16:46:12 +01:00
Sylvain Bellemare
9f471ef4b3 Merge branch 'master' into divisible-assets 2016-11-14 16:39:02 +01:00
Sylvain Bellemare
e7ff6edd4e Fix typos 2016-11-14 15:54:24 +01:00
Tim Daubenschütz
9e7229bc66 Merge pull request #690 from bigchaindb/docs/689/block-model-doc-strings
Add doc strings for Block cls
2016-11-14 15:02:50 +01:00
tim
74e1f9c303 Fix tense in docs 2016-11-14 14:59:09 +01:00
Sylvain Bellemare
6ef18fbbae Simplify Transaction.to_inputs method 2016-11-14 14:47:23 +01:00
tim
37cf057b99 PR Feedback for docs 2016-11-14 13:56:05 +01:00
tim
b42eec93c7 Fix indentation for model docs 2016-11-14 13:53:49 +01:00
tim
f69ccc93df Add doc strings for Block cls 2016-11-14 13:51:02 +01:00
Ryan Henderson
29832f9a9b add get_genesis_block (#809) 2016-11-14 10:04:28 +01:00
Ryan Henderson
c8553abb41 add backlog count (#806) 2016-11-14 10:03:59 +01:00
Tim Daubenschütz
32a247552c Merge pull request #802 from bigchaindb/change/XX/reformat-doc-to-79-chars
Format http api docs to 79 chars
2016-11-11 15:44:07 +01:00
tim
1c8fec730c Format http api docs to 79 chars 2016-11-11 15:38:28 +01:00
Ryan Henderson
d31a268a51 add id query (#799) 2016-11-11 15:08:37 +01:00
Rodolphe Marques
6d7392d98d Handle the case where there are negative amounts.
Created tests
2016-11-11 11:34:20 +01:00
Troy McConaghy
af3f48b353 Merge pull request #801 from bigchaindb/fixed-broken-link-in-contributing-md
Fixed broken link in CONTRIBUTING.md file
2016-11-10 16:58:41 +01:00
troymc
c30c32bcd5 In Release_Process.md, noted we use semantic versioning 2016-11-10 16:44:42 +01:00
Rodolphe Marques
6d9cdd0bb5 removed addressed todo 2016-11-10 13:20:09 +01:00
Rodolphe Marques
bca7939f6c Added an AssetLink class to link to a Asset from a TRANSFER transaction 2016-11-10 13:18:20 +01:00
Rodolphe Marques
70aec6eb46 cleanup code 2016-11-10 12:03:01 +01:00
Rodolphe Marques
d8be9ac3ec Fixed typo
Renamed some variables to make the code more readable
2016-11-10 11:59:22 +01:00
Troy McConaghy
2fef201489 Fixed broken link in CONTRIBUTING.md file
Fixed the link to the setuptools documentation about "extras", i.e. the `extras_require` bit of `setup.py`.
2016-11-10 10:22:29 +01:00
Troy McConaghy
ed09cf3c8e Created a file to outline our release process 2016-11-09 18:40:16 +01:00
Rodolphe Marques
a2e28ae806 addressed comments 2016-11-09 17:48:39 +01:00
Rodolphe Marques
efb5439044 updated docstrings
addressed added todos
2016-11-09 14:56:14 +01:00
Rodolphe Marques
dccbc3c1fe pep8 fixes 2016-11-09 14:25:42 +01:00
Rodolphe Marques
7313cd9441 get_asset_by_id now uses the new db api 2016-11-09 14:03:34 +01:00
Rodolphe Marques
de23053ebc Merge remote-tracking branch 'origin/master' into divisible-assets 2016-11-09 13:36:56 +01:00
Rodolphe Marques
e35d2899b5 Removed support for custom threshold
Removed support for hashlocks
Unskipped tests that were skipped waiting for divisible assets
Fixed remaining tests
2016-11-09 13:32:18 +01:00
Rodolphe Marques
19cfe172ea Added support for multiple owners_before in CREATE transactions
Added some type checking
Remove code for hashlocks and timelocks. They were partially implemented
features that we need to revisit.
2016-11-08 17:41:53 +01:00
Sylvain Bellemare
c65d2779c9 Remove base58 2016-11-08 14:37:10 +01:00
Troy McConaghy
04824df012 Merge pull request #793 from bigchaindb/modify-get-transaction
get_transaction will now return a tx from backlog, even if there are some in invalid blocks
2016-11-08 14:07:54 +01:00
Sylvain Bellemare
3b9f6801a8 Simplify the common code a bit 2016-11-07 16:24:07 +01:00
Rodolphe Marques
9a5bc816d8 re-added code to handle hashlock conditions 2016-11-07 15:26:42 +01:00
Rodolphe Marques
6e2ac1df03 remove unused code 2016-11-07 10:04:09 +01:00
Rodolphe Marques
3ac530617c Fixed some tests 2016-11-06 22:35:39 +01:00
Rodolphe Marques
a212aba35b Added validation for amounts
Added a new db call to return an asset instance given the id

Created tests
2016-11-06 20:00:47 +01:00
Rodolphe Marques
db55aa8153 Support for multiple io in TRANSFER transactions
Create tests
2016-11-06 18:09:43 +01:00
troymc
6930f93d4c Added test for case when tx is in backlog and an invalid block 2016-11-06 10:13:29 +01:00
Rodolphe Marques
ee3b967184 Added support for divisible assets in TRANSFER transactions
Created tests
2016-11-06 01:55:47 +01:00
Rodolphe Marques
5b5c701e0a Finished implementing divisible assets for CREATE transactions
Simplified Transaction.create logic
Created tests
2016-11-06 00:04:27 +01:00
troymc
e81283fee9 test_read_transaction_invalid_block didn't need to write tx to backlog 2016-11-05 17:30:48 +01:00
troymc
191c60ce37 Minor change to get_transaction + revised its docstring 2016-11-05 17:29:58 +01:00