Commit Graph

443 Commits

Author SHA1 Message Date
Leonid Logvinov
abd6fbfa64 Use variable name in assertin message 2017-06-06 12:50:18 +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
279790117b Remove message param from before 2017-06-06 12:43:20 +02:00
Leonid Logvinov
f7236e7f49 Rename senderAccount to senderAddress 2017-06-06 12:40:58 +02:00
Leonid Logvinov
ed3d1a8142 Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync 2017-06-06 12:37:52 +02:00
Leonid Logvinov
c9fe2b16b9 Rename senderAccount to takerAddress 2017-06-06 12:37:14 +02:00
Leonid Logvinov
ce203d9e9d Remove redundant reassignment 2017-06-06 12:35:17 +02:00
Leonid Logvinov
8bf9e4167a Fix comments 2017-06-06 12:33:27 +02:00
Leonid Logvinov
d36fa17153 Add tests for isSenderAccountHexAsync 2017-06-06 11:08:48 +02:00
Leonid Logvinov
fc912aff68 Fix tests 2017-06-06 10:53:57 +02:00
Leonid Logvinov
2a08042727 Add variableName to isSenderAddcountHexAsync 2017-06-06 10:25:28 +02:00
Leonid Logvinov
bac6833436 Make methods accept senderAccount 2017-06-05 16:22:56 +02:00
Leonid Logvinov
eb5c9ae708 Upgrade truffle-contract to the version that includes 'at' fix 2017-06-05 11:48:41 +02:00
Leonid
63854603e1 Merge pull request #33 from 0xProject/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2017-06-03 16:18:46 +02:00
Fabio Berger
3d75a50235 Merge pull request #32 from 0xProject/addEventSubscriptions
Implement zeroEx.exchange.subscribeAsync
2017-06-02 21:18:02 +02:00
Leonid
88815e5b45 Merge pull request #29 from 0xProject/remainingTokenMethods
Implement Remaining Token Methods
2017-06-02 21:01:58 +02:00
Fabio Berger
2e5e8c8987 Consolidate the ExchangeContract type and flesh out type definition for isValidSignature.call 2017-06-02 20:54:44 +02:00
Fabio Berger
3e115eab4a Run stopWatching in parallel 2017-06-02 20:49:44 +02:00
Fabio Berger
78d7febede Be more specific with blockParam valid values 2017-06-02 20:46:27 +02:00
Fabio Berger
36e937f8de Merge branch 'master' into remainingTokenMethods
# Conflicts:
#	src/contract_wrappers/token_wrapper.ts
2017-06-02 20:39:02 +02:00
Fabio Berger
c6ceb44682 Fix bug 2017-06-02 20:34:16 +02:00
Fabio Berger
bae4b1ee1b Fix comment 2017-06-02 20:33:58 +02:00
Fabio Berger
054797fa51 Add missing async suffix 2017-06-02 20:33:50 +02:00
Fabio Berger
bef967f405 remove space 2017-06-02 20:22:25 +02:00
Fabio Berger
c90ffd92a5 Update artifacts 2017-06-02 20:22:10 +02:00
greenkeeper[bot]
abe65f0ce3 docs(readme): add Greenkeeper badge 2017-06-02 18:06:05 +00: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
greenkeeper[bot]
d488dd79ed chore(package): update dependencies 2017-06-02 18:02:49 +00:00
Fabio Berger
40208e3b2d Merge branch 'master' into addEventSubscriptions 2017-06-02 20:01:29 +02:00
Fabio Berger
1a52c43288 Revert unintentional artifact changes 2017-06-02 19:58:02 +02:00
Leonid
5925f81fe1 Merge pull request #31 from 0xProject/unavailableFilledCancelled
Implement Unavailable, Filled and Cancelled
2017-06-02 19:53:01 +02:00
Leonid Logvinov
2ff8f4ca6e Use forked version of chai-bignumber while the PR is waiting for a review 2017-06-02 19:52:23 +02:00
Fabio Berger
1443c0838c Merge branch 'master' into remainingTokenMethods
# Conflicts:
#	src/types.ts
#	src/web3_wrapper.ts
2017-06-02 19:45:57 +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
Leonid
c83587a16d Merge pull request #30 from 0xProject/fillOrderAsync
fillOrderAsync
2017-06-02 18:53:21 +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
Leonid Logvinov
9620b18fec Address feedback 2017-06-02 18:37:25 +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
Fabio Berger
ebe5084876 Fix comment 2017-06-02 18:33:57 +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
16c296be14 Add ZRX_TOKEN_NOT_IN_REGISTRY 2017-06-02 18:14:51 +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