diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 21:48:23 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 22:31:17 +0800 |
| commit | a1acf19ff3c1948214dde05a91eb3fbeac728d2c (patch) | |
| tree | 44789fff181ec24846728d885ba541c23f682321 /packages/contract-wrappers | |
| parent | 5044fe4fe4486f67408572cf6807482aecf7f6c9 (diff) | |
| download | dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.gz dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.zst dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.zip | |
Fix a bad merge
Diffstat (limited to 'packages/contract-wrappers')
| -rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts index b5ea56789..3e7619228 100644 --- a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts @@ -1,5 +1,5 @@ import { schemas } from '@0xproject/json-schemas'; -import { assetProxyUtils } from '@0xproject/order-utils'; +import { assetDataUtils } from '@0xproject/order-utils'; import { AssetProxyId, Order, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; @@ -1074,7 +1074,7 @@ export class ExchangeWrapper extends ContractWrapper { */ public getZRXAssetData(): string { const zrxTokenAddress = this.getZRXTokenAddress(); - const zrxAssetData = assetProxyUtils.encodeERC20AssetData(zrxTokenAddress); + const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxTokenAddress); return zrxAssetData; } // tslint:disable:no-unused-variable |