crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
431 Commits 83 Branches 5,211 Tags
4dc9a14aaf1c01ba28326af575d1eaf6ac1d4606
Commit Graph

82 Commits

Author SHA1 Message Date
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
Leonid Logvinov
e1ee6b8494 Add check for ROUNDING_ERROR and test for it 2017-06-02 12:57:21 +02:00
Fabio Berger
6f98d83284 Merge branch 'fillOrderAsync' into addEventSubscriptions 
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
 2017-06-02 12:42:31 +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
efcfa1af70 Add tests for subscribeAsync, making sure events are caught and that subscriptions are removed on provider change 2017-06-02 12:32:38 +02:00
Leonid Logvinov
2a0c6abbe7 Validate maker balance and allowance & tests 2017-06-02 12:20:27 +02:00
Fabio Berger
104b7f2549 Merge branch 'fillOrderAsync' into addEventSubscriptions 
# Conflicts:
#	src/0x.js.ts
#	test/exchange_wrapper_test.ts
 2017-06-02 12:19:00 +02:00
Leonid Logvinov
4caf1b009e Add test for valid partial fill 2017-06-02 12:08:25 +02:00
Leonid Logvinov
5155f49804 Add test for insufficient balance and make all async tests async 2017-06-02 12:03:52 +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
03bc3f08cd Simplify tests 2017-06-02 10:02:19 +02:00
Fabio Berger
707a5f55eb Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCanceledTakerAmountAsync 2017-06-02 09:43:03 +02:00
Leonid Logvinov
f663a15c9b Fix tests 2017-06-01 21:12:13 +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
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
Leonid Logvinov
aef3ed9fd7 Follow constants convention 2017-06-01 17:51:49 +02:00
Fabio Berger
85d4badbd6 remove unused arg 2017-06-01 17:39:58 +02:00
Leonid Logvinov
ab5d999549 Remove duplicate declarations 2017-06-01 17:29:13 +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