Commit Graph

135 Commits

Author SHA1 Message Date
Leonid Logvinov
d727bed6ab Prefix private vars with _ 2017-06-10 15:36:52 +02:00
Leonid
f4c6097f24 Merge branch 'master' into subscribe-async-tests 2017-06-09 19:50:12 +02:00
Leonid Logvinov
5d2843ef6f Add test for zeroEx.exchange.getCanceledTakerAmountAsync 2017-06-09 18:54:12 +02:00
Leonid Logvinov
800788eca4 Fix tests 2017-06-09 18:12:45 +02:00
Leonid Logvinov
2fd5d29b40 Remove only 2017-06-09 17:57:51 +02:00
Leonid Logvinov
b63c973d14 Add LogCancel test to subscribeAsync 2017-06-09 17:49:50 +02:00
Leonid Logvinov
6d4cb28b9d Address feedback 2017-06-09 15:49:56 +02:00
Leonid
c94485dfbb Merge branch 'master' into fillOrderUpToAsync 2017-06-08 18:33:19 +02:00
Leonid Logvinov
6eb192f0ea Add tests for fillOrdersUpTo 2017-06-08 18:14:29 +02:00
Fabio Berger
2b08c04d4d Merge branch 'master' into batchFillOrKill
# Conflicts:
#	test/exchange_wrapper_test.ts
2017-06-08 18:09:47 +02:00
Leonid
d7b5212b73 Merge pull request #47 from 0xProject/is-valid-signature-contract
Refactor isValidSignature
2017-06-08 17:20:49 +02:00
Leonid
5513d01175 Merge branch 'master' into is-valid-signature-contract 2017-06-08 17:02:30 +02:00
Leonid
3090a71e9d Merge branch 'master' into batchFillAsync 2017-06-08 16:46:58 +02:00
Fabio Berger
f25447aa3d Merge branch 'master' into batchFillOrKill 2017-06-08 16:45:50 +02:00
Leonid Logvinov
49d8b5b18b Address feedback 2017-06-08 16:28:55 +02:00
Leonid Logvinov
cb68f9c9ec Remove tests for isValidSignatureUsingContractCallAsync 2017-06-08 12:20:01 +02:00
Leonid Logvinov
8311203f73 Refactor isValidSignature 2017-06-08 12:14:35 +02:00
Leonid Logvinov
464e761053 Add getOrderHashHexUsingContractCallAsync 2017-06-08 12:03:14 +02:00
Leonid Logvinov
c132271780 Merge branch 'master' into batchFillAsync 2017-06-08 11:31:40 +02:00
Fabio Berger
6e97489c1a Merge branch 'master' into batchFillOrKill
# Conflicts:
#	src/types.ts
2017-06-08 11:26:46 +02:00
Fabio Berger
8ab80914e0 Implement batchFillOrKill and tests 2017-06-08 11:25:47 +02:00
Leonid Logvinov
80294873c1 Format inputs 2017-06-08 11:09:55 +02:00
Leonid
41f005a676 Merge branch 'master' into batchCancelAsync 2017-06-07 21:45:18 +02:00
Leonid Logvinov
01c33ef8b7 Add no-op test 2017-06-07 19:12:43 +02:00
Leonid Logvinov
edbbf5a215 Add success test 2017-06-07 19:11:21 +02:00
Leonid Logvinov
badbaa39fc Address feedback 2017-06-07 17:46:55 +02:00
Leonid Logvinov
31b1097350 Remove only 2017-06-07 16:51:58 +02:00
Leonid Logvinov
5bb04528d3 Merge branch 'batchCancelAsync' into batchFillAsync 2017-06-07 16:42:02 +02:00
Leonid Logvinov
c3cd5812e6 Refactor to use OrderCancellationRequest 2017-06-07 14:40:28 +02:00
Leonid Logvinov
efbd81df02 Move fillableAmount to initialization section 2017-06-07 13:36:21 +02:00
Leonid Logvinov
426f43391e Move initialization up 2017-06-07 13:33:04 +02:00
Leonid Logvinov
d5767428e5 Move fillOrderAsync to fill order describe block 2017-06-07 13:32:05 +02:00
Fabio Berger
d3a74e51e3 Fix tests with removed shouldCheckTransfer 2017-06-07 13:27:36 +02:00
Leonid Logvinov
2947f55acf Add tests for batchCancelAsync 2017-06-07 13:26:13 +02:00
Leonid Logvinov
87e0eceb9b Add comments for dates 2017-06-07 13:26:13 +02:00
Leonid Logvinov
91101eb8ec Add tests for batchCancelAsync 2017-06-07 13:20:02 +02:00
Fabio Berger
4eee0b52f1 merge master 2017-06-07 12:48:26 +02:00
Fabio Berger
918315e89f Implement fillOrKill & tests 2017-06-07 12:40:58 +02:00
Leonid Logvinov
8ec2f685ab Add comments for dates 2017-06-07 12:21:53 +02:00
Leonid Logvinov
9daca6a4be Address feedback 2017-06-07 11:04:42 +02:00
Leonid Logvinov
56dc33f3a6 Fix tests 2017-06-06 17:40:18 +02:00
Leonid Logvinov
c7c5ce3ef6 Remove only 2017-06-06 17:31:11 +02:00
Leonid Logvinov
42b4952693 Add test when the order was already cancelled or filled 2017-06-06 17:26:16 +02:00
Leonid Logvinov
fa910bca0e Add checks and tests for expired order and zero fill amount 2017-06-06 16:57:13 +02:00
Leonid Logvinov
5412e80315 Merge branch 'master' into cancelAsync 2017-06-06 16:02:36 +02:00
Fabio Berger
db5d59b06e Pass nonExistentSenderAddress so that we get the proper rejection 2017-06-06 15:53:18 +02:00
Leonid Logvinov
8aa673aabe Add initial implementation with success test 2017-06-06 15:36:07 +02:00
Leonid
692a0fd965 Merge pull request #39 from 0xProject/senderAccount
Make methods accept senderAccount
2017-06-06 15:14:53 +02:00
Leonid
d1d5477e8d Merge branch 'master' into chai-setup 2017-06-06 13:45:25 +02:00
Leonid Logvinov
aeec2a96b0 Address feedback 2017-06-06 11:28:11 +02:00