diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
commit | 5aaf87d61260ec4723e7eb0a887629b057454957 (patch) | |
tree | 0637dfabfec4e71f5cc7d3b2f46712572bb58ce0 /packages/contracts/test/unlimited_allowance_token.ts | |
parent | 10478a6b2fd1f2a01597a88afde9cf582640a849 (diff) | |
parent | 96b31f39749fb32bd89978245c79aa637791336c (diff) | |
download | dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.gz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.bz2 dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.lz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.xz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.zst dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.zip |
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype:
Fix tslint issues
Fix tslint failure
Pass in fee and assetAmount rather then the whole signedOrder
Fix missing paths
Revert to returning orderState on invalid order
- Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming
Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to 'packages/contracts/test/unlimited_allowance_token.ts')
-rw-r--r-- | packages/contracts/test/unlimited_allowance_token.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/test/unlimited_allowance_token.ts b/packages/contracts/test/unlimited_allowance_token.ts index ac232d8ff..0c3f5094b 100644 --- a/packages/contracts/test/unlimited_allowance_token.ts +++ b/packages/contracts/test/unlimited_allowance_token.ts @@ -3,9 +3,9 @@ import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import 'make-promises-safe'; -import { DummyERC20TokenContract } from '../src/contract_wrappers/generated/dummy_e_r_c20_token'; +import { DummyERC20TokenContract } from '../src/generated_contract_wrappers/dummy_e_r_c20_token'; import { artifacts } from '../src/utils/artifacts'; -import { expectRevertOrAlwaysFailingTransactionAsync, expectRevertOrOtherErrorAsync } from '../src/utils/assertions'; +import { expectRevertOrOtherErrorAsync } from '../src/utils/assertions'; import { chaiSetup } from '../src/utils/chai_setup'; import { constants } from '../src/utils/constants'; import { provider, txDefaults, web3Wrapper } from '../src/utils/web3_wrapper'; |