Commit Graph

107 Commits

Author SHA1 Message Date
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
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
badbaa39fc Address feedback 2017-06-07 17:46:55 +02:00
Leonid Logvinov
c3cd5812e6 Refactor to use OrderCancellationRequest 2017-06-07 14:40:28 +02:00
Fabio Berger
d3a74e51e3 Fix tests with removed shouldCheckTransfer 2017-06-07 13:27:36 +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
Leonid Logvinov
bac6833436 Make methods accept senderAccount 2017-06-05 16:22:56 +02:00
Leonid Logvinov
713ad291c4 Add chai-as-promised 2017-06-05 15:31:39 +02:00
Leonid Logvinov
592cab8d3f Add a couple of awaits and returns for async tests 2017-06-05 14:12:20 +02:00
Leonid Logvinov
4dc9a14aaf Add chai_setup 2017-06-05 13:07:26 +02:00
Fabio Berger
bef967f405 remove space 2017-06-02 20:22:25 +02:00
Fabio Berger
45f9ffd86c Merge branch 'master' into addEventSubscriptions
# Conflicts:
#	src/types.ts
#	test/exchange_wrapper_test.ts
#	test/utils/fill_scenarios.ts
2017-06-02 20:05:25 +02:00
Fabio Berger
40208e3b2d Merge branch 'master' into addEventSubscriptions 2017-06-02 20:01:29 +02:00
Leonid
5925f81fe1 Merge pull request #31 from 0xProject/unavailableFilledCancelled
Implement Unavailable, Filled and Cancelled
2017-06-02 19:53:01 +02:00
Fabio Berger
d4320fec72 Add includeStack config to chai setup so that we get stackTraces 2017-06-02 19:38:28 +02:00
Fabio Berger
ae15425f0b Merge branch 'master' into addEventSubscriptions
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	test/exchange_wrapper_test.ts
2017-06-02 19:14:20 +02:00
Fabio Berger
35c9330d62 Merge branch 'master' into unavailableFilledCancelled
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	test/exchange_wrapper_test.ts
2017-06-02 19:03:53 +02:00
Fabio Berger
3fad55d118 Fix undefined web3 issue 2017-06-02 18:46:47 +02:00
Leonid Logvinov
45c4f203df Fix linter errors 2017-06-02 18:37:38 +02:00
Fabio Berger
0c98f4c754 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-02 18:34:24 +02:00
Fabio Berger
3551f07914 Fix ordering 2017-06-02 18:34:18 +02:00
Leonid Logvinov
cc6b27cbb1 Address feedback 2017-06-02 18:24:24 +02:00
Leonid Logvinov
7cf60b589b Address feedback 2017-06-02 18:20:17 +02:00
Leonid Logvinov
a52f834deb Fix test name 2017-06-02 18:16:55 +02:00
Leonid Logvinov
199843718f Remove spaces 2017-06-02 18:13:22 +02:00
Leonid Logvinov
76280dd5db Address feedback 2017-06-02 18:10:06 +02:00
Leonid Logvinov
abf2cf4c5e Move FillOrderValidatinErrs to ExchangeContractErrs 2017-06-02 18:00:37 +02:00
Leonid Logvinov
7fd84e29ab Rename EXPIRED to FILL_ORDER_EXPIRED 2017-06-02 17:40:06 +02:00
Leonid Logvinov
e5cc0e0562 Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER 2017-06-02 17:38:47 +02:00
Fabio Berger
827a0d4e91 rename fillTakerAmountInBaseUnits to fillTakerAmount 2017-06-02 17:03:36 +02:00
Leonid Logvinov
3c71506022 Rename coinBase to coinbase 2017-06-02 16:26:47 +02:00
Leonid Logvinov
07c61b1f9b Refactor balance & allowance tests 2017-06-02 16:25:05 +02:00
Leonid Logvinov
c650d1ba20 Add tests and checks for fees balances and allowances 2017-06-02 16:18:54 +02:00
Leonid Logvinov
d8587875b8 Add success test for fill with fees 2017-06-02 15:24:42 +02:00