aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/dispatcher.ts
Commit message (Collapse)AuthorAgeFilesLines
* Change import paths from z_r_x and e_r_c to zrx and erc. Also rename event ↵Leonid Logvinov2018-06-291-3/+3
| | | | args after templates change
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-281-5/+4
| | | | as well as only deploy the number of ERC20 tokens needed for each test suite
* Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-271-5/+5
|\ | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts
| * Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-261-5/+5
| |
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-261-6/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
* | \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-261-6/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
| * | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-261-6/+3
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-251-2/+1
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-251-2/+1
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-251-5/+10
|\| |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-5/+5
| | |
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-5/+3
| | |
| * | Check revert reason in dispatcher testsFabio Berger2018-06-221-4/+11
| |/
* / Remove hack in ERC20WrapperFabio Berger2018-06-191-1/+4
|/
* Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-131-2/+6
|
* Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-081-4/+4
| | | | assetMetadata, proxyData, proxyMetadata to assetData
* merge v2-prototypeFabio Berger2018-06-071-12/+9
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-8/+9
| |\ | | | | | | | | | feature/improve-linting
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-071-5/+5
| | |
| | * Replace constant.REVERT test assertions with ↵Alex Browne2018-06-071-8/+9
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Linter now passesfragosti2018-06-061-4/+0
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-061-4/+4
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-2/+2
| | | | package.
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-13/+13
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-231-62/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts
| * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-221-62/+101
| |
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-221-0/+6
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-15/+14
|/
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-161-14/+12
|
* Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+12
|
* merge v2-prototypeFabio Berger2018-04-241-10/+10
|
* Fix testsAmir Bandeali2018-04-241-0/+267
generated by cgit (git 2.34.1) at 2024-11-20 09:44:44 +0800