Commit Graph

5149 Commits

Author SHA1 Message Date
Leonid Logvinov
5155f49804 Add test for insufficient balance and make all async tests async 2017-06-02 12:03:52 +02:00
Leonid Logvinov
a740498c80 Introduce coinBase account
Add makerAccount parameter
Adjust tests
Add more assertions to success test
2017-06-02 11:23:39 +02:00
Fabio Berger
03bc3f08cd Simplify tests 2017-06-02 10:02:19 +02:00
Fabio Berger
114b5ea0fe improve comment 2017-06-02 09:59:10 +02:00
Fabio Berger
2cf5208f85 Add comment about the isString assertion lest the next developer tries to use a stricter assertion (i.e isHexString) which we intentionally did not do 2017-06-02 09:49:50 +02:00
Fabio Berger
707a5f55eb Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCanceledTakerAmountAsync 2017-06-02 09:43:03 +02:00
Fabio Berger
293ce6f4b2 Always wrap BigNumbers returned by web3 with our own version and add comment 2017-06-02 09:39:05 +02:00
Fabio Berger
3e0c2ad753 Merge branch 'fillOrderAsync' into unavailableFilledCancelled 2017-06-01 21:14:30 +02:00
Leonid Logvinov
f663a15c9b Fix tests 2017-06-01 21:12:13 +02:00
Leonid Logvinov
511fa537ad Work 2017-06-01 20:04:12 +02:00
Fabio Berger
a1be870585 Create a FillsScenario utils module and use it in the fillOrder tests 2017-06-01 19:47:22 +02:00
Leonid Logvinov
c42877327e Change test name 2017-06-01 18:52:56 +02:00
Fabio Berger
aade6891e8 fix tslint error 2017-06-01 18:35:23 +02:00
Fabio Berger
2aaf71e488 Merge branch 'fillOrderAsync' into unavailableFilledCancelled 2017-06-01 18:34:42 +02:00
Leonid Logvinov
520248e678 Make validateFillOrder asyncronous 2017-06-01 18:31:08 +02:00
Leonid Logvinov
0554f947b1 Add not enough taker balance tests 2017-06-01 18:21:12 +02:00
Fabio Berger
de93bf1690 Merge branch 'fillOrderAsync' into unavailableFilledCancelled 2017-06-01 18:15:50 +02:00
Leonid Logvinov
6ced554d9f Revert "Add test to check the balance"
This reverts commit 389c18e98e.
2017-06-01 18:15:26 +02:00
Fabio Berger
acb8a6c55e Merge branch 'fillOrderAsync' into unavailableFilledCancelled
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	src/utils/assert.ts
2017-06-01 18:14:17 +02:00
Leonid Logvinov
389c18e98e Add test to check the balance 2017-06-01 17:56:01 +02:00
Fabio Berger
19e922724e rename variable 2017-06-01 17:52:31 +02:00
Leonid Logvinov
aef3ed9fd7 Follow constants convention 2017-06-01 17:51:49 +02:00
Fabio Berger
69a596352d Fix getOrderHashAsync test 2017-06-01 17:49:53 +02:00
Fabio Berger
29955d3606 Fix import 2017-06-01 17:49:41 +02:00
Fabio Berger
85d4badbd6 remove unused arg 2017-06-01 17:39:58 +02:00
Fabio Berger
3a4020c78b Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 17:38:25 +02:00
Fabio Berger
35b7a60e97 Add missing comma and semi-colon 2017-06-01 17:38:20 +02:00
Fabio Berger
24a745092e Stop passing exchangeAddress into getOrderHash and instead get it from the artifacts 2017-06-01 17:38:09 +02:00
Leonid Logvinov
39957df2c3 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 17:30:25 +02:00
Leonid Logvinov
ab5d999549 Remove duplicate declarations 2017-06-01 17:29:13 +02:00
Fabio Berger
7ff0f677a1 move external imports to top 2017-06-01 17:27:23 +02:00
Fabio Berger
1e8eb054bc get rid of literal amount params 2017-06-01 17:25:33 +02:00
Fabio Berger
3e76497f4e remove duplicate declarations 2017-06-01 17:19:06 +02:00
Fabio Berger
5888a03a02 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
# Conflicts:
#	test/exchange_wrapper_test.ts
2017-06-01 17:17:32 +02:00
Fabio Berger
cc0d641107 Add async suffix and fix alignment 2017-06-01 17:16:16 +02:00
Leonid Logvinov
d1f352810f give some balance and allowance by default 2017-06-01 17:13:15 +02:00
Leonid Logvinov
9a3cd3d06c Add test, for throw when order is expired 2017-06-01 17:10:35 +02:00
Fabio Berger
bcc8e43ab8 reorder variabled 2017-06-01 17:08:44 +02:00
Fabio Berger
2c65a658e7 remove legacy code 2017-06-01 17:07:53 +02:00
Fabio Berger
00c597411f reorder import 2017-06-01 17:07:43 +02:00
Fabio Berger
33940ec8fe Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 17:04:05 +02:00
Fabio Berger
60d658a024 put external imports at the top 2017-06-01 17:03:49 +02:00
Fabio Berger
59bc13c188 remove comment 2017-06-01 17:03:39 +02:00
Leonid Logvinov
af61b5a908 Add shouldCheckTransfer 2017-06-01 17:03:15 +02:00
Leonid Logvinov
5ded2bd52b Refactor tests 2017-06-01 17:01:54 +02:00
Fabio Berger
8193d0f5b2 rename txData to txOpts 2017-06-01 16:55:34 +02:00
Fabio Berger
ea42715b9a remove superfluous param 2017-06-01 16:54:20 +02:00
Fabio Berger
fe025506c9 remove unused arg 2017-06-01 16:30:06 +02:00
Fabio Berger
f756e1d24e remove unneeded method 2017-06-01 16:25:37 +02:00
Fabio Berger
6c590354c7 improve comment 2017-06-01 16:25:28 +02:00