Commit Graph

45 Commits

Author SHA1 Message Date
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
fee0e5bfc7 Update chai_setup.ts 2017-06-06 14:04:01 +02:00
Leonid Logvinov
33cf004b29 Remove unused variable 2017-06-06 12:48:40 +02:00
Leonid Logvinov
67e2208a18 Rename accounts to addreses 2017-06-06 12:48:00 +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
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
16c296be14 Add ZRX_TOKEN_NOT_IN_REGISTRY 2017-06-02 18:14:51 +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
a07a9d8571 Add token utils 2017-06-02 15:24:11 +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
Fabio Berger
19e922724e rename variable 2017-06-01 17:52:31 +02:00
Fabio Berger
85d4badbd6 remove unused arg 2017-06-01 17:39:58 +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
Fabio Berger
7ff0f677a1 move external imports to top 2017-06-01 17:27:23 +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
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
28dee77db8 Temp push 2017-05-31 21:15:15 +02:00
Leonid Logvinov
7d29fb2174 Remove debug output 2017-05-31 16:06:14 +02:00
Leonid Logvinov
7f269cd791 Add createSignedOrder function 2017-05-31 16:03:06 +02:00
Leonid Logvinov
be13cf127c Refactor getOrderHash to accept order as an object 2017-05-30 17:35:17 +02:00
Leonid Logvinov
be4248f345 Fix import 2017-05-30 14:59:24 +02:00
Leonid Logvinov
3e65ac018c Merge branch 'master' into fillOrderAsync 2017-05-30 14:55:43 +02:00
Leonid Logvinov
acd5fba133 Add order utils 2017-05-30 12:56:51 +02:00
Fabio Berger
d15002a110 Add tests for setProvider 2017-05-30 12:30:38 +02:00
Leonid Logvinov
9bb738bb2f Finish ecSignature renaming 2017-05-29 22:45:05 +02:00
Fabio Berger
4c3c1d049b improve comment 2017-05-26 18:08:50 +02:00
Fabio Berger
d5feb5fc79 rename BlockClean to BlockchainLifecycle and setupAsync to startAsync, restoreAsync to revertAsync 2017-05-26 18:01:54 +02:00
Fabio Berger
a6da9cd073 Add missing return types 2017-05-26 17:47:00 +02:00
Fabio Berger
555bac19cb Setup blockchain snapshotting before/after every test, implemented unit tests for exchangeWrapper.isValidSignature 2017-05-26 17:12:22 +02:00