aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Change non-exhange contracts to also return txHashLeonid Logvinov2017-09-053-7/+10
|
* Implement zeroEx.awaitTransactionMinedLeonid Logvinov2017-09-052-7/+4
|
* Temporarily remove web3_beta, cause it breaks installation and testsLeonid Logvinov2017-09-052-22/+0
|
* Make the functions immidiately return txHash instead of awaiting for a ↵Leonid Logvinov2017-09-052-48/+19
| | | | transaction to be mined
* Fix tests descriptionsLeonid Logvinov2017-09-041-2/+2
|
* Add 'content-type' header with value 'application/json' for http requests ↵Brandon Millman2017-09-011-0/+3
| | | | made JSONRPC endpoints
* Don't create whole web3 object in beta testsLeonid Logvinov2017-08-302-9/+3
|
* Add tests for web3@1.0Leonid Logvinov2017-08-301-0/+16
|
* Use zeroEx.getAvailableAddressesAsync instead of web3.eth.getAccountsLeonid Logvinov2017-08-304-4/+4
|
* Add web3@1.0 to web3FactoryLeonid Logvinov2017-08-301-0/+12
|
* Use zeroExConfig in testsLeonid Logvinov2017-08-291-1/+4
|
* Specify gasPrice in WETH testsLeonid Logvinov2017-08-291-1/+2
|
* Use 0x-json-schemasLeonid Logvinov2017-08-282-360/+4
|
* Add an explanatory commentLeonid Logvinov2017-08-251-1/+4
|
* Add a test that unlimited allowance reduces gas costLeonid Logvinov2017-08-251-0/+28
|
* Add tests for unlimited allowanceLeonid Logvinov2017-08-251-0/+21
|
* Change the unregistered token in testsLeonid Logvinov2017-08-241-2/+2
|
* Add tests for tokenRegistry public gettersLeonid Logvinov2017-08-241-3/+57
|
* Add test for getTokenAddressesAsyncLeonid Logvinov2017-08-241-0/+14
|
* Add validation for the case where the order is fully filled or canceled and ↵Leonid Logvinov2017-08-241-0/+9
| | | | a test
* Fix order validation testsLeonid Logvinov2017-08-241-19/+20
|
* Remove And's from namesLeonid Logvinov2017-08-241-33/+36
|
* Separate order validation errors tests from exchange testsLeonid Logvinov2017-08-242-84/+95
|
* Merge pull request #131 from 0xProject/addTokenRegistryMethodFabio Berger2017-08-241-0/+16
|\ | | | | Add public method to TokenRegistry
| * rename method for clarity since we return a Token and not tokenMetadataFabio Berger2017-08-241-3/+3
| |
| * use non-checksummed addressFabio Berger2017-08-241-1/+1
| |
| * Add public method `getTokenMetadataIfExistsAsync` to TokenRegistry wrapper, ↵Fabio Berger2017-08-231-0/+16
| | | | | | | | refactor `getTokensAsync` to use `getTokenMetadataIfExistsAsync` under the hood and added unit tests
* | rename proxy_wrapper_test to token_transfer_proxy_wrapper_testFabio Berger2017-08-231-0/+0
|/
* Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowance in ↵Leonid Logvinov2017-08-224-37/+41
| | | | tests
* Rename internally Proxy to TokenTransferProxyLeonid Logvinov2017-08-222-3/+3
|
* Put the last test address on it's own lineLeonid Logvinov2017-08-221-1/+3
|
* Use lowercase address in testsLeonid Logvinov2017-08-221-1/+1
|
* Reject checksummed addressesLeonid Logvinov2017-08-222-4/+8
|
* Merge pull request #118 from 0xProject/artifacts-updateFabio Berger2017-08-211-4/+0
|\ | | | | Update artifacts with the latest mainnet version
| * Remove url from token registryLeonid Logvinov2017-08-151-4/+0
| |
* | set default value to hasAddresses booleanFabio Berger2017-08-171-1/+1
| |
* | remove unnecessary assertion and add regression testFabio Berger2017-08-171-17/+40
| |
* | Remove isUserAddressAvailable assertion from getBalanceAsync and add ↵Fabio Berger2017-08-172-21/+43
|/ | | | regression test
* Indent callbacksLeonid Logvinov2017-07-261-2/+2
|
* Rearrange importsLeonid Logvinov2017-07-261-1/+1
|
* Remove unused importsLeonid Logvinov2017-07-264-4/+1
|
* Fix testsLeonid Logvinov2017-07-261-1/+1
|
* Factor out order validation testsLeonid Logvinov2017-07-262-147/+203
|
* Cover all possible branches of order validation errors with testsLeonid Logvinov2017-07-261-14/+59
|
* Add a test: should throw when maker has balance to cover fees or transfer ↵Leonid Logvinov2017-07-261-0/+15
| | | | but not both
* Use actual exception values in test namesLeonid Logvinov2017-07-121-3/+3
|
* Use PascalCase names as string enum keysLeonid Logvinov2017-07-124-30/+30
|
* Make getOrderHashHex staticLeonid Logvinov2017-07-123-11/+11
|
* Migrate to using a single Exchange contractLeonid Logvinov2017-07-124-81/+24
|
* Migrate eventsLeonid Logvinov2017-07-111-4/+4
|
* Merge pull request #100 from 0xProject/improveSignOrderFabio Berger2017-07-081-9/+3
|\ | | | | Improve signOrderHashAsync
| * Modify signOrderHashAsync to parse the signatureHex string as V + R + S AND ↵Fabio Berger2017-07-081-9/+3
| | | | | | | | R + S + V and check both for a valid signature in order to fix the issue of different nodes returning it differently
* | Merge branch 'master' into cache_net_versionLeonid2017-07-083-49/+49
|\ \
| * \ Merge pull request #97 from 0xProject/speedup-testsLeonid2017-07-081-30/+30
| |\ \ | | | | | | | | Paralellize fill scenarios
| | * | Add noop commentLeonid2017-07-081-1/+1
| | | |
| | * | Paralellize fill scenariosLeonid Logvinov2017-07-081-30/+30
| | | |
| * | | Merge pull request #98 from 0xProject/typosLeonid2017-07-081-6/+6
| |\ \ \ | | |_|/ | |/| | Typos
| | * | Rename batchCancelOrderAsync to batchCancelOrdersAsyncLeonid Logvinov2017-07-081-3/+3
| | | |
| | * | Rename batchFillOrderAsync to batchFillOrdersAsyncLeonid Logvinov2017-07-081-3/+3
| | |/
| * / Remove space after `it` keywork in testsFabio Berger2017-07-082-13/+13
| |/
* | Rename networkId to networkIdIfExistsLeonid Logvinov2017-07-071-2/+2
| |
* | Fix a typo in a filenameLeonid Logvinov2017-07-071-0/+0
| |
* | Rename RPC_NETWORK_ID to TESTRPC_NETWORK_IDLeonid Logvinov2017-07-072-3/+3
| |
* | Remove onlyLeonid Logvinov2017-07-071-1/+1
| |
* | Add tests for networkId caching and invalidationLeonid Logvinov2017-07-072-0/+30
|/
* Fix comments to use web3 provider instead of web3 instanceLeonid Logvinov2017-07-072-2/+2
|
* Move zeroEx.exchange.getAvailableContractAddressesAsync to ↵Leonid Logvinov2017-07-064-32/+26
| | | | zeroEx.getAvailableExchangeContractAddressesAsync and zeroEx.exchange.getProxyAuthorizedContractAddressesAsync to zeroEx.getProxyAuthorizedExchangeContractAddressesAsync
* Make all fields of subscriptionOpts schema optionalLeonid Logvinov2017-07-051-3/+3
|
* move order hash schema to a separate fileLeonid Logvinov2017-07-051-1/+2
|
* Add exchangeContractAddress to an order in schema testsLeonid Logvinov2017-07-051-0/+1
|
* Use .bignumber for BigNumber comparationLeonid Logvinov2017-07-051-2/+2
|
* Refactor event testsLeonid Logvinov2017-07-051-13/+12
|
* Add tests for order hash SchemaLeonid Logvinov2017-07-051-1/+20
|
* Add tests for subscriptionOptsSchema and blockParamSchemaLeonid Logvinov2017-07-041-0/+38
|
* Handle errors from pseudo-async subscription testsLeonid Logvinov2017-07-042-10/+10
|
* Merge branch 'master' into subscribe-tokenLeonid2017-07-042-4/+13
|\
| * Merge pull request #89 from 0xProject/proxyLeonid2017-07-042-4/+13
| |\ | | | | | | Add zeroEx.proxy
| | * Add zeroEx.proxy.getAuthorizedAddressesAsync and testsLeonid Logvinov2017-07-041-0/+11
| | |
| | * Make proxy wrapper public on zeroEx instanceLeonid Logvinov2017-07-042-4/+2
| | |
* | | Add initial implementation and tests for zeroEx.token.subscribeAsyncLeonid Logvinov2017-07-041-1/+112
|/ /
* | Fix merge problemsLeonid Logvinov2017-07-041-2/+3
| |
* | Merge branch 'master' into wrap-log-bignumberLeonid2017-07-046-61/+145
|\|
| * Merge branch 'master' into add-exchange-address-to-order-structLeonid2017-07-041-0/+3
| |\
| | * Assert correct event names in subscribeAsync testsLeonid Logvinov2017-07-011-0/+3
| | |
| * | Fix commentLeonid Logvinov2017-07-011-1/+1
| | |
| * | Add tests for getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+12
| | |
| * | Remove unused code from test/proxy_wrapper_test.tsLeonid Logvinov2017-06-301-12/+0
| | |
| * | Add a test for a ProxyWrapperLeonid Logvinov2017-06-301-0/+35
| | |
| * | Make zeroEx.getOrderHashHex non-asyncLeonid Logvinov2017-06-302-10/+10
| | |
| * | Fix typo in getAvailableContractAddressesAsyncLeonid Logvinov2017-06-302-3/+3
| | |
| * | Make it clear that we are using a fake address in testsLeonid Logvinov2017-06-301-2/+2
| | |
| * | Fix a typo in a nameLeonid Logvinov2017-06-301-2/+2
| | |
| * | Make getOrderHashHex a non-async functionLeonid Logvinov2017-06-301-13/+2
| | |
| * | Allow multiple exchange versions t be functional at the same timeLeonid Logvinov2017-06-275-38/+95
| |/
* / Wrap all event args in a newer version of BigNumber and test itLeonid Logvinov2017-07-021-21/+24
|/
* Merge pull request #81 from 0xProject/addWrappedETHSupportLeonid2017-06-271-0/+106
|\ | | | | Add Wrapped ETH Support
| * refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ↵Fabio Berger2017-06-271-18/+25
| | | | | | | | assertions to check if the discrepancy between the existing ETH balance and expected balance is small enough to simply be the gas cost used by the transaction.
| * Fix typoFabio Berger2017-06-271-1/+1
| |
| * Implement EtherTokenWrapper and tests, with deposit and withdraw methodsFabio Berger2017-06-261-0/+99
| |
* | Rename KOVAN_URL to KOVAN_RPC_URLLeonid Logvinov2017-06-232-2/+2
| |
* | Simplify integration testsLeonid Logvinov2017-06-231-34/+4
| |
* | Refactor KOVAN_URL to constants and fetch mnemonic from package.jsonLeonid Logvinov2017-06-232-2/+7
| |
* | Add kovan integration testsLeonid Logvinov2017-06-231-0/+54
|/
* Merge branch 'master' into fill-order-amuontLeonid2017-06-235-20/+16
|\
| * Revert "Use different lodash import syntax which allows to include only used ↵Leonid2017-06-225-20/+16
| | | | | | | | functions"
* | Add test for return amount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-0/+6
| |
* | Add test for cancelOrderAsync return valueLeonid Logvinov2017-06-221-0/+4
| |
* | Add simple test checking that fillOrderAsync return filled amountLeonid Logvinov2017-06-221-0/+10
| |
* | Return filledAmount from fillOrderAsyncLeonid Logvinov2017-06-211-0/+18
|/
* Fall back to import x = require() syntaxLeonid Logvinov2017-06-215-9/+9
|
* Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-215-16/+20
|
* Fix bug in 0x.js tests when passing Web3 instead of Web3 ProviderLeonid Logvinov2017-06-151-1/+1
|
* Make ZeroEx constructor accept Web3Provider instead of Web3 instanceLeonid Logvinov2017-06-155-7/+7
|
* Remove types that are not used in public interface from export and rename ↵Leonid Logvinov2017-06-142-3/+2
| | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues
* Address feedbackLeonid Logvinov2017-06-141-2/+2
|
* Add tests for stopWatchingAsyncLeonid Logvinov2017-06-131-0/+20
|
* Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-131-10/+16
|
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-131-0/+7
|
* Fix testLeonid Logvinov2017-06-131-1/+1
|
* Fix testLeonid Logvinov2017-06-131-1/+1
|
* Introduce index.ts file which defines public interfaceLeonid Logvinov2017-06-137-12/+7
|
* Change main file name from 0x.js.ts to 0x.tsLeonid Logvinov2017-06-127-7/+7
|
* Fix last testsLeonid Logvinov2017-06-111-3/+3
|
* Fix some testsLeonid Logvinov2017-06-101-12/+12
|
* Prefix private vars with _Leonid Logvinov2017-06-102-8/+8
|
* Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-2/+1
|\
| * Merge branch 'master' into json-schemaLeonid2017-06-101-10/+258
| |\
| * \ Merge branch 'master' into json-schemaLeonid2017-06-101-3/+8
| |\ \
| * | | Fix testsLeonid Logvinov2017-06-101-2/+1
| | | |
* | | | Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-10/+258
|\ \ \ \ | | |_|/ | |/| |
| * | | Address feedbackLeonid Logvinov2017-06-101-10/+20
| | | |
| * | | Fix bugs in schemasLeonid Logvinov2017-06-101-3/+3
| | | |
| * | | Merge branch 'master' into schema-testsLeonid2017-06-101-3/+8
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into schema-testsLeonid2017-06-091-0/+34
| |\ \ \ | | | |/ | | |/|
| * | | Fix testsLeonid Logvinov2017-06-091-1/+1
| | | |
| * | | Add tests for fillOrderRequests schemaLeonid Logvinov2017-06-091-0/+26
| | | |
| * | | Add tests for orderCancellationRequestsSchemaLeonid Logvinov2017-06-091-0/+26
| | | |
| * | | Fix tests and add fillOrKillRequests schemaLeonid Logvinov2017-06-091-11/+37
| | | |
| * | | Refactor testsLeonid Logvinov2017-06-091-53/+47
| | | |
| * | | Add tests for signedOrderSchemaLeonid Logvinov2017-06-091-0/+35
| | | |
| * | | Add tests for order schemaLeonid Logvinov2017-06-091-0/+36
| | | |
| * | | Tolerate more than one validation error in testsLeonid Logvinov2017-06-091-1/+5
| | | |
| * | | Rename to validateAgainstSchemaLeonid Logvinov2017-06-091-11/+11
| | | |
| * | | Add tests for TokenSchemaLeonid Logvinov2017-06-091-2/+37
| | | |
| * | | Add ecSignatureSchema testsLeonid Logvinov2017-06-091-36/+58
| | | |
| * | | Add ecSignatureParameter testLeonid Logvinov2017-06-091-0/+20
| | | |
| * | | Add tests for address schemaLeonid Logvinov2017-06-091-7/+21
| | | |
* | | | Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-3/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Add test for zeroEx.exchange.getCanceledTakerAmountAsyncLeonid Logvinov2017-06-101-3/+8
| | |/ | |/|
* | | Fix testsLeonid Logvinov2017-06-101-4/+4
| | |
* | | Remove onlyLeonid Logvinov2017-06-091-1/+1
| | |
* | | Add LogCancel test to subscribeAsyncLeonid Logvinov2017-06-091-2/+18
|/ /
* | Address feedbackLeonid Logvinov2017-06-091-1/+1
| |
* | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-092-52/+77
|\|
| * Add orderFillOrKillRequestsSchema and validate using it instead of looping ↵Fabio Berger2017-06-091-1/+1
| | | | | | | | over the requests and validating them individually
| * Merge branch 'master' into batchFillOrKillFabio Berger2017-06-093-314/+254
| |\ | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
| * \ Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+22
| |\ \
| * \ \ Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-23/+72
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts
| * | | | Implement batchFillOrKill and testsFabio Berger2017-06-081-51/+76
| | | | |
* | | | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix isValidSignature testsFabio Berger2017-06-091-16/+18
| | | | |
* | | | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-0/+34
|/ / / /
* | | | Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-081-2/+2
|\ \ \ \ | | | | | | | | | | Interface tweaks
| * \ \ \ Merge branch 'master' into interfaceTweaksLeonid2017-06-081-0/+22
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Make web3Wrapper protected instead of publicFabio Berger2017-06-081-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #47 from 0xProject/is-valid-signature-contractLeonid2017-06-082-121/+25
|\ \ \ \ | | | | | | | | | | Refactor isValidSignature
| * \ \ \ Merge branch 'master' into is-valid-signature-contractLeonid2017-06-081-0/+22
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix linter errorLeonid Logvinov2017-06-081-3/+3
| | | | |
| * | | | Rewrite isValidSignature testsLeonid Logvinov2017-06-081-51/+25
| | | | |
| * | | | Remove tests for isValidSignatureUsingContractCallAsyncLeonid Logvinov2017-06-081-78/+0
| | | | |
| * | | | Refactor isValidSignatureLeonid Logvinov2017-06-081-13/+21
| | |/ / | |/| |
* | | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| | | |
* | | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| | | |
* | | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+22
|\ \ \ \ | | |/ / | |/| |
| * | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+22
| |/ /
* | | Address feedbackLeonid Logvinov2017-06-082-7/+17
| | |
* | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-082-7/+79
|\| |
| * | Format inputsLeonid Logvinov2017-06-081-1/+2
| | |
| * | Merge branch 'master' into batchCancelAsyncLeonid2017-06-082-2/+100
| |\|
| | * add `hex` to function and variable name for clarityFabio Berger2017-06-071-1/+1
| | |
| | * Fix tests with removed shouldCheckTransferFabio Berger2017-06-071-6/+3
| | |
| | * merge masterFabio Berger2017-06-072-5/+52
| | |\
| | * | Implement fillOrKill & testsFabio Berger2017-06-071-1/+102
| | | |
| * | | Address feedbackLeonid Logvinov2017-06-071-8/+4
| | | |
* | | | Add no-op testLeonid Logvinov2017-06-081-3/+3
| | | |
* | | | Add success testLeonid Logvinov2017-06-082-5/+33
| | | |
* | | | Remove onlyLeonid Logvinov2017-06-071-1/+1
| | | |
* | | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-12/+22
|\| | |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-071-11/+21
| | | |
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-23/+65
| | |/ | |/|
| * | Add comments for datesLeonid Logvinov2017-06-071-2/+2
| | |
* | | Move fillableAmount to initialization sectionLeonid Logvinov2017-06-071-8/+17
| | |
* | | Move initialization upLeonid Logvinov2017-06-071-15/+15
| | |
* | | Move fillOrderAsync to fill order describe blockLeonid Logvinov2017-06-071-179/+185
| | |
* | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-23/+65
| | |
* | | Add comments for datesLeonid Logvinov2017-06-071-2/+2
|/ /
* | Address feedbackLeonid Logvinov2017-06-071-2/+2
| |
* | Fix testsLeonid Logvinov2017-06-061-1/+1
| |
* | Remove onlyLeonid Logvinov2017-06-061-1/+1
| |
* | Add test when the order was already cancelled or filledLeonid Logvinov2017-06-061-0/+5
| |
* | Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-061-1/+17
| |
* | Merge branch 'master' into cancelAsyncLeonid Logvinov2017-06-062-3/+5
|\|
| * Pass nonExistentSenderAddress so that we get the proper rejectionFabio Berger2017-06-061-1/+2
| |
| * avoid newline issues by putting the assertion message on a single lineFabio Berger2017-06-061-2/+3
| |
* | Add initial implementation with success testLeonid Logvinov2017-06-062-4/+30
|/
* Update schema_test.tsLeonid2017-06-061-1/+1
|
* Merge pull request #39 from 0xProject/senderAccountLeonid2017-06-065-57/+66
|\ | | | | Make methods accept senderAccount
| * Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-061-3/+3
| |
| * Last round of renamingsLeonid Logvinov2017-06-062-13/+13
| |
| * Use variable name in assertin messageLeonid Logvinov2017-06-061-1/+1
| |
| * Remove unused variableLeonid Logvinov2017-06-061-1/+0
| |
| * Rename accounts to addresesLeonid Logvinov2017-06-063-3/+3
| |
| * Remove message param from beforeLeonid Logvinov2017-06-061-1/+1
| |
| * Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-061-3/+3
| |
| * Add tests for isSenderAccountHexAsyncLeonid Logvinov2017-06-061-0/+33
| |
| * Make methods accept senderAccountLeonid Logvinov2017-06-054-57/+34
| |
* | Merge pull request #35 from 0xProject/chai-setupLeonid2017-06-065-18/+22
|\ \ | | | | | | Add chai_setup
| * | Update chai_setup.tsLeonid2017-06-061-1/+1
| | |
| * | Merge branch 'master' into chai-setupLeonid2017-06-062-4/+16
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-065-12/+12
| | | |
| * | | Add chai_setupLeonid Logvinov2017-06-055-17/+22
| | |/ | |/|
* | | Merge pull request #34 from 0xProject/number-regexLeonid2017-06-061-0/+46
|\ \ \ | |_|/ |/| | Add tests to number regex and BigNumber serialization & fix bugs
| * | Address feedbackLeonid Logvinov2017-06-061-18/+23
| | |
| * | Add tests to number regex and BigNumber serialization & fix bugsLeonid Logvinov2017-06-051-0/+41
| |/
* | Merge pull request #38 from 0xProject/async-errorsLeonid2017-06-061-4/+6
|\ \ | | | | | | Add a couple of awaits and returns for async tests
| * | Add chai-as-promisedLeonid Logvinov2017-06-051-0/+2
| | |
| * | Add a couple of awaits and returns for async testsLeonid Logvinov2017-06-051-4/+4
| |/
* | Address feedbackLeonid Logvinov2017-06-061-1/+2
| |
* | Add regression test for transferFrom bugLeonid Logvinov2017-06-051-0/+10
|/
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-032-5/+87
|\ | | | | Implement zeroEx.exchange.subscribeAsync
| * remove spaceFabio Berger2017-06-031-1/+1
| |
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-032-9/+5
| |\ | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # test/exchange_wrapper_test.ts # test/utils/fill_scenarios.ts
| * \ Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-0/+4
| |\ \
| * \ \ Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-98/+252
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * \ \ \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-0/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts
| * | | | | Add tests for subscribeAsync, making sure events are caught and that ↵Fabio Berger2017-06-021-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | subscriptions are removed on provider change
| * | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵Fabio Berger2017-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | if user updates the provider
| * | | | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-022-29/+80
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
* | \ \ \ \ \ Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-032-8/+96
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts
| * | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelledLeonid2017-06-032-8/+96
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Implement Unavailable, Filled and Cancelled
| | * | | | | Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-034-99/+249
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| | * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-022-29/+105
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| | * | | | Simplify testsFabio Berger2017-06-021-16/+11
| | | | | |
| | * | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵Fabio Berger2017-06-022-8/+97
| | | | | | | | | | | | | | | | | | | | | | | | and getCanceledTakerAmountAsync
* | | | | | Fix bugFabio Berger2017-06-031-7/+5
| | | | | |
* | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-039-145/+536
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts
| * | | | | Add includeStack config to chai setup so that we get stackTracesFabio Berger2017-06-034-0/+4
| | |_|/ / | |/| | |
| * | | | Fix undefined web3 issueFabio Berger2017-06-031-2/+2
| | | | |
| * | | | Fix linter errorsLeonid Logvinov2017-06-031-4/+12
| | | | |
| * | | | Address feedbackLeonid Logvinov2017-06-032-3/+5
| | | | |