aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* 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
| | | | |
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-033-36/+34
| |\ \ \ \
| | * | | | Address feedbackLeonid Logvinov2017-06-031-8/+8
| | | | | |
| | * | | | Address feedbackLeonid Logvinov2017-06-032-10/+10
| | | | | |
| | * | | | Fix test nameLeonid Logvinov2017-06-031-1/+1
| | | | | |
| | * | | | Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-031-1/+1
| | | | | |
| | * | | | Remove spacesLeonid Logvinov2017-06-031-3/+1
| | | | | |
| | * | | | Address feedbackLeonid Logvinov2017-06-031-8/+8
| | | | | |
| | * | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-031-13/+13
| | | | | |
| | * | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-021-1/+1
| | | | | |
| | * | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-021-1/+1
| | | | | |
| * | | | | Fix orderingFabio Berger2017-06-031-1/+1
| |/ / / /
| * | | | rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-021-21/+21
| | | | |
| * | | | Rename coinBase to coinbaseLeonid Logvinov2017-06-022-12/+12
| | | | |
| * | | | Refactor balance & allowance testsLeonid Logvinov2017-06-021-47/+42
| | | | |
| * | | | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-021-1/+44
| | | | |
| * | | | Add success test for fill with feesLeonid Logvinov2017-06-022-5/+33
| | | | |
| * | | | Add token utilsLeonid Logvinov2017-06-021-0/+23
| | | | |
| * | | | Add fill scenario with feesLeonid Logvinov2017-06-022-10/+41
| | | | |
| * | | | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-022-18/+40
| | |/ / | |/| |
| * | | Validate maker balance and allowance & testsLeonid Logvinov2017-06-021-0/+25
| | |/ | |/|
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-0/+17
| |\ \
| | * | Add test for valid partial fillLeonid Logvinov2017-06-021-0/+17
| | | |
| * | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵Fabio Berger2017-06-021-2/+2
| |/ / | | | | | | | | | undefined if non available
| * | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-15/+32
| | |
| * | Introduce coinBase accountLeonid Logvinov2017-06-022-16/+29
| |/ | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test
| * Fix testsLeonid Logvinov2017-06-021-2/+2
| |
| * WorkLeonid Logvinov2017-06-022-15/+30
| |
| * Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-022-37/+56
| |
| * Change test nameLeonid Logvinov2017-06-021-3/+2
| |
| * Make validateFillOrder asyncronousLeonid Logvinov2017-06-021-1/+2
| |
| * Add not enough taker balance testsLeonid Logvinov2017-06-021-7/+17
| |
| * Revert "Add test to check the balance"Leonid Logvinov2017-06-021-10/+0
| | | | | | | | This reverts commit 389c18e98e2b5663b1732d7c34f9b21afef66e44.
| * Add test to check the balanceLeonid Logvinov2017-06-011-0/+10
| |
| * rename variableFabio Berger2017-06-011-2/+2
| |
| * Follow constants conventionLeonid Logvinov2017-06-011-2/+2
| |
| * Fix getOrderHashAsync testFabio Berger2017-06-011-0/+13
| |
| * remove unused argFabio Berger2017-06-012-7/+4
| |
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-15/+3
| |\
| | * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncLeonid Logvinov2017-06-011-2/+2
| | |\
| | * | Remove duplicate declarationsLeonid Logvinov2017-06-011-15/+3
| | | |
| * | | Add missing comma and semi-colonFabio Berger2017-06-011-2/+2
| | | |
| * | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵Fabio Berger2017-06-012-24/+23
| | |/ | |/| | | | | | | artifacts
| * | move external imports to topFabio Berger2017-06-011-2/+2
| |/
| * get rid of literal amount paramsFabio Berger2017-06-011-6/+16
| |
| * remove duplicate declarationsFabio Berger2017-06-011-3/+0
| |
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-8/+18
| |\ | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
| | * give some balance and allowance by defaultLeonid Logvinov2017-06-011-5/+4
| | |
| | * Add test, for throw when order is expiredLeonid Logvinov2017-06-011-3/+14
| | |
| * | Add async suffix and fix alignmentFabio Berger2017-06-011-9/+9
| |/
| * reorder variabledFabio Berger2017-06-011-3/+3
| |
| * remove legacy codeFabio Berger2017-06-011-1/+0
| |
| * reorder importFabio Berger2017-06-011-1/+1
| |
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-9/+10
| |\
| | * Add shouldCheckTransferLeonid Logvinov2017-06-011-1/+1
| | |
| | * Refactor testsLeonid Logvinov2017-06-011-10/+11
| | |
| * | put external imports at the topFabio Berger2017-06-011-6/+6
| | |
| * | remove commentFabio Berger2017-06-011-1/+0
| |/
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-3/+7
| |\
| | * Add timestamp parameter to order factoryLeonid Logvinov2017-06-011-3/+7
| | |
| * | Add comment for fillOrderAsync method, rename fillAmount to ↵Fabio Berger2017-06-011-3/+4
| |/ | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer
| * Revert "Add EXPIRED test"Leonid Logvinov2017-06-012-29/+19
| | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c.
| * Add EXPIRED testLeonid Logvinov2017-06-012-19/+29
| |
| * Fix testsLeonid Logvinov2017-06-011-8/+2
| |
| * Add NOT_A_TAKER checkLeonid Logvinov2017-06-011-1/+10
| |
| * Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-011-2/+2
| |
| * Add taker parameter to createSignedOrderLeonid Logvinov2017-06-012-3/+6
| |
| * Rename order to order_factoryLeonid Logvinov2017-06-012-1/+1
| |
| * Remove unnecessary checksLeonid Logvinov2017-06-011-5/+0
| |
| * Fix linter errorsLeonid Logvinov2017-06-012-22/+24
| |
| * Add dirty-chaiLeonid Logvinov2017-06-011-0/+4
| |
| * Allign parametersLeonid Logvinov2017-06-011-2/+2
| |
| * Use constLeonid Logvinov2017-06-011-1/+1
| |
| * Add setDefaultAccountLeonid Logvinov2017-06-011-2/+2
| |
| * Temp pushLeonid Logvinov2017-06-012-55/+58
| |
| * Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-011-26/+28
| |\
| * | Add setAllowance functionLeonid Logvinov2017-05-311-4/+18
| | |
| * | Fix linter errorsLeonid Logvinov2017-05-311-1/+1
| | |
| * | Remove debug outputLeonid Logvinov2017-05-311-3/+0
| | |
| * | Revert testsLeonid Logvinov2017-05-311-7/+43
| | |
| * | Add createSignedOrder functionLeonid Logvinov2017-05-311-6/+23
| | |
| * | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-312-2/+111
| |\ \
| * | | Refactor getOrderHash to accept order as an objectLeonid Logvinov2017-05-303-46/+43
| | | |
| * | | Remove fixtureLeonid Logvinov2017-05-301-35/+0
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:51:52 +0800