Commit Graph

13 Commits

Author SHA1 Message Date
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
Leonid Logvinov
9620b18fec Address feedback 2017-06-02 18:37:25 +02:00
Leonid Logvinov
7cf60b589b Address feedback 2017-06-02 18:20:17 +02:00
Leonid Logvinov
3c71506022 Rename coinBase to coinbase 2017-06-02 16:26:47 +02:00
Leonid Logvinov
d8587875b8 Add success test for fill with fees 2017-06-02 15:24:42 +02:00
Leonid Logvinov
832d2ff5ca Add fill scenario with fees 2017-06-02 13:08:59 +02:00
Leonid Logvinov
e1ee6b8494 Add check for ROUNDING_ERROR and test for it 2017-06-02 12:57:21 +02:00
Fabio Berger
ab5b5a881b Merge branch 'fillOrderAsync' into unavailableFilledCancelled
# Conflicts:
#	src/0x.js.ts
#	test/exchange_wrapper_test.ts
2017-06-02 12:40:22 +02:00
Fabio Berger
fc7592d73f Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or undefined if non available 2017-06-02 12:15:50 +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
707a5f55eb Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCanceledTakerAmountAsync 2017-06-02 09:43:03 +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