diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-18 21:18:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 21:18:54 +0800 |
| commit | e2fb49a8f871fd4b631bb01bb641c632b7c19435 (patch) | |
| tree | 6a04c7686159cfa80435e47e08ceb08533c0dd77 /packages/contracts/test/utils/core_combinatorial_utils.ts | |
| parent | f3241ff86a0d99f4291c5a5f4eaaa5ebe1736da0 (diff) | |
| parent | b9e7973a0f92661f2e469b748a162b0d3bb53624 (diff) | |
| download | dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar.gz dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar.bz2 dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar.lz dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar.xz dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.tar.zst dexon-sol-tools-e2fb49a8f871fd4b631bb01bb641c632b7c19435.zip | |
Merge pull request #884 from 0xProject/export-more-0x.js
Export missing V2 pieces from 0x.js
Diffstat (limited to 'packages/contracts/test/utils/core_combinatorial_utils.ts')
| -rw-r--r-- | packages/contracts/test/utils/core_combinatorial_utils.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/test/utils/core_combinatorial_utils.ts b/packages/contracts/test/utils/core_combinatorial_utils.ts index 7c16ef201..44a5199c0 100644 --- a/packages/contracts/test/utils/core_combinatorial_utils.ts +++ b/packages/contracts/test/utils/core_combinatorial_utils.ts @@ -1,5 +1,5 @@ import { - assetProxyUtils, + assetDataUtils, BalanceAndProxyAllowanceLazyStore, ExchangeTransferSimulator, orderHashUtils, @@ -72,7 +72,7 @@ export async function coreCombinatorialUtilsFactoryAsync( erc20EighteenDecimalTokenB, zrxToken, ] = await erc20Wrapper.deployDummyTokensAsync(erc20EighteenDecimalTokenCount, eighteenDecimals); - const zrxAssetData = assetProxyUtils.encodeERC20AssetData(zrxToken.address); + const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const erc20FiveDecimalTokenCount = 2; const fiveDecimals = new BigNumber(5); @@ -598,8 +598,8 @@ export class CoreCombinatorialUtils { break; case TakerAssetFillAmountScenario.LessThanRemainingFillableTakerAssetAmount: - const takerAssetProxyId = assetProxyUtils.decodeAssetDataId(signedOrder.takerAssetData); - const makerAssetProxyId = assetProxyUtils.decodeAssetDataId(signedOrder.makerAssetData); + const takerAssetProxyId = assetDataUtils.decodeAssetProxyId(signedOrder.takerAssetData); + const makerAssetProxyId = assetDataUtils.decodeAssetProxyId(signedOrder.makerAssetData); const isEitherAssetERC721 = takerAssetProxyId === AssetProxyId.ERC721 || makerAssetProxyId === AssetProxyId.ERC721; if (isEitherAssetERC721) { |