diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:45:48 +0800 |
commit | 20f93185975d16c77492f05eb86dd89695539cd9 (patch) | |
tree | 37b0380cbe98b8a44a350232d4125a1cc77b06b0 /packages/contracts/src/utils/erc20_wrapper.ts | |
parent | b646c8441467212e60f03c868a55d6ab70720aba (diff) | |
parent | 9bc6ebde4e4425799ed3ddfb50495029865e3ae8 (diff) | |
download | dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.gz dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.tar.zst dexon-0x-contracts-20f93185975d16c77492f05eb86dd89695539cd9.zip |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype:
Fix linter issue
Fix linter issue
Fix tslint issues
Fix missing paths
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/src/utils/erc20_wrapper.ts')
-rw-r--r-- | packages/contracts/src/utils/erc20_wrapper.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/src/utils/erc20_wrapper.ts b/packages/contracts/src/utils/erc20_wrapper.ts index efb245c89..fc42fbff2 100644 --- a/packages/contracts/src/utils/erc20_wrapper.ts +++ b/packages/contracts/src/utils/erc20_wrapper.ts @@ -3,8 +3,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; -import { DummyERC20TokenContract } from '../contract_wrappers/generated/dummy_e_r_c20_token'; -import { ERC20ProxyContract } from '../contract_wrappers/generated/e_r_c20_proxy'; +import { DummyERC20TokenContract } from '../generated_contract_wrappers/dummy_e_r_c20_token'; +import { ERC20ProxyContract } from '../generated_contract_wrappers/e_r_c20_proxy'; import { artifacts } from './artifacts'; import { constants } from './constants'; |