diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 21:40:45 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 21:40:45 +0800 |
commit | 5044fe4fe4486f67408572cf6807482aecf7f6c9 (patch) | |
tree | 59f455c6815059fd4fb011506624c10327b7db61 /packages/contracts/test/utils/order_factory_from_scenario.ts | |
parent | 8e49169e6b3233cdc39d1867104cd0ec043c600a (diff) | |
parent | e2fb49a8f871fd4b631bb01bb641c632b7c19435 (diff) | |
download | dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.gz dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.bz2 dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.lz dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.xz dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.zst dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.zip |
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/contracts/test/utils/order_factory_from_scenario.ts')
-rw-r--r-- | packages/contracts/test/utils/order_factory_from_scenario.ts | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/packages/contracts/test/utils/order_factory_from_scenario.ts b/packages/contracts/test/utils/order_factory_from_scenario.ts index e0edbff26..a908140b9 100644 --- a/packages/contracts/test/utils/order_factory_from_scenario.ts +++ b/packages/contracts/test/utils/order_factory_from_scenario.ts @@ -1,4 +1,4 @@ -import { assetProxyUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; +import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; import { Order } from '@0xproject/types'; import { BigNumber, errorUtils } from '@0xproject/utils'; @@ -75,18 +75,16 @@ export class OrderFactoryFromScenario { switch (orderScenario.makerAssetDataScenario) { case AssetDataScenario.ZRXFeeToken: - makerAssetData = assetProxyUtils.encodeERC20AssetData(this._zrxAddress); + makerAssetData = assetDataUtils.encodeERC20AssetData(this._zrxAddress); break; case AssetDataScenario.ERC20NonZRXEighteenDecimals: - makerAssetData = assetProxyUtils.encodeERC20AssetData( - this._nonZrxERC20EighteenDecimalTokenAddresses[0], - ); + makerAssetData = assetDataUtils.encodeERC20AssetData(this._nonZrxERC20EighteenDecimalTokenAddresses[0]); break; case AssetDataScenario.ERC20FiveDecimals: - makerAssetData = assetProxyUtils.encodeERC20AssetData(this._erc20FiveDecimalTokenAddresses[0]); + makerAssetData = assetDataUtils.encodeERC20AssetData(this._erc20FiveDecimalTokenAddresses[0]); break; case AssetDataScenario.ERC721: - makerAssetData = assetProxyUtils.encodeERC721AssetData( + makerAssetData = assetDataUtils.encodeERC721AssetData( this._erc721Token.address, erc721MakerAssetIds[0], ); @@ -97,18 +95,16 @@ export class OrderFactoryFromScenario { switch (orderScenario.takerAssetDataScenario) { case AssetDataScenario.ZRXFeeToken: - takerAssetData = assetProxyUtils.encodeERC20AssetData(this._zrxAddress); + takerAssetData = assetDataUtils.encodeERC20AssetData(this._zrxAddress); break; case AssetDataScenario.ERC20NonZRXEighteenDecimals: - takerAssetData = assetProxyUtils.encodeERC20AssetData( - this._nonZrxERC20EighteenDecimalTokenAddresses[1], - ); + takerAssetData = assetDataUtils.encodeERC20AssetData(this._nonZrxERC20EighteenDecimalTokenAddresses[1]); break; case AssetDataScenario.ERC20FiveDecimals: - takerAssetData = assetProxyUtils.encodeERC20AssetData(this._erc20FiveDecimalTokenAddresses[1]); + takerAssetData = assetDataUtils.encodeERC20AssetData(this._erc20FiveDecimalTokenAddresses[1]); break; case AssetDataScenario.ERC721: - takerAssetData = assetProxyUtils.encodeERC721AssetData( + takerAssetData = assetDataUtils.encodeERC721AssetData( this._erc721Token.address, erc721TakerAssetIds[0], ); |