Commit Graph

233 Commits

Author SHA1 Message Date
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
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
Leonid Logvinov
6ced554d9f Revert "Add test to check the balance"
This reverts commit 389c18e98e.
2017-06-01 18:15:26 +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
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
abd113f61f Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 16:21:09 +02:00
Fabio Berger
44f1144242 Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer 2017-06-01 16:21:01 +02:00
Leonid Logvinov
52bdc0d343 Add timestamp parameter to order factory 2017-06-01 16:17:15 +02:00
Leonid Logvinov
771c88ec79 Revert "Add EXPIRED test"
This reverts commit d8e35c364e.
2017-06-01 16:12:40 +02:00
Leonid Logvinov
d8e35c364e Add EXPIRED test 2017-06-01 15:46:27 +02:00
Leonid Logvinov
21d00f04d4 Fix tests 2017-06-01 15:21:24 +02:00
Leonid Logvinov
d5d20db439 Add NOT_A_TAKER check 2017-06-01 15:18:13 +02:00
Leonid Logvinov
07cdfa655b Add FILL_AMOUNT_IS_ZERO check 2017-06-01 15:13:32 +02:00
Leonid Logvinov
75d0b69db2 Add taker parameter to createSignedOrder 2017-06-01 14:57:34 +02:00
Leonid Logvinov
ef7ac6ac2d Rename order to order_factory 2017-06-01 14:53:26 +02:00
Leonid Logvinov
448be396cb Remove unnecessary checks 2017-06-01 14:52:25 +02:00
Leonid Logvinov
dbb30aa1dd Fix linter errors 2017-06-01 11:46:57 +02:00
Leonid Logvinov
de3a2ff672 Add dirty-chai 2017-06-01 11:40:08 +02:00
Leonid Logvinov
0a68a69d0c Allign parameters 2017-06-01 11:15:52 +02:00
Leonid Logvinov
cc7592e931 Use const 2017-06-01 11:07:58 +02:00
Leonid Logvinov
f450f538a0 Add setDefaultAccount 2017-06-01 11:07:36 +02:00
Leonid Logvinov
28dee77db8 Temp push 2017-05-31 21:15:15 +02:00
Leonid Logvinov
886ed9180d Merge branch 'master' into fillOrderAsync 2017-05-31 19:26:18 +02:00
Leonid Logvinov
4d43f4d610 Address feedback 2017-05-31 17:54:01 +02:00
Leonid Logvinov
82a46b4938 Add setAllowance function 2017-05-31 17:45:15 +02:00