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/forwarder_wrapper.ts | |
parent | 8e49169e6b3233cdc39d1867104cd0ec043c600a (diff) | |
parent | e2fb49a8f871fd4b631bb01bb641c632b7c19435 (diff) | |
download | dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.gz dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.bz2 dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.lz dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.xz dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.zst dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.zip |
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/contracts/test/utils/forwarder_wrapper.ts')
-rw-r--r-- | packages/contracts/test/utils/forwarder_wrapper.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/test/utils/forwarder_wrapper.ts b/packages/contracts/test/utils/forwarder_wrapper.ts index e73bc7a2e..e39df14b1 100644 --- a/packages/contracts/test/utils/forwarder_wrapper.ts +++ b/packages/contracts/test/utils/forwarder_wrapper.ts @@ -1,4 +1,4 @@ -import { assetProxyUtils } from '@0xproject/order-utils'; +import { assetDataUtils } from '@0xproject/order-utils'; import { AssetProxyId, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; @@ -24,7 +24,7 @@ export class ForwarderWrapper { private readonly _zrxAddress: string; private static _createOptimizedSellOrders(signedOrders: SignedOrder[]): MarketSellOrders { const marketSellOrders = formatters.createMarketSellOrders(signedOrders, ZERO_AMOUNT); - const assetDataId = assetProxyUtils.decodeAssetDataId(signedOrders[0].makerAssetData); + const assetDataId = assetDataUtils.decodeAssetProxyId(signedOrders[0].makerAssetData); // Contract will fill this in for us as all of the assetData is assumed to be the same for (let i = 0; i < signedOrders.length; i++) { if (i !== 0 && assetDataId === AssetProxyId.ERC20) { @@ -90,7 +90,7 @@ export class ForwarderWrapper { txData: TxDataPayable, opts: { feeProportion?: number; feeRecipient?: string } = {}, ): Promise<TransactionReceiptWithDecodedLogs> { - const assetDataId = assetProxyUtils.decodeAssetDataId(orders[0].makerAssetData); + const assetDataId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData); if (assetDataId !== AssetProxyId.ERC20) { throw new Error('Asset type not supported by marketSellEthForERC20'); } @@ -116,7 +116,7 @@ export class ForwarderWrapper { feeProportion: number, makerAssetFillAmount: BigNumber, ): Promise<BigNumber> { - const assetProxyId = assetProxyUtils.decodeAssetDataId(orders[0].makerAssetData); + const assetProxyId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData); switch (assetProxyId) { case AssetProxyId.ERC20: { const fillAmountWei = this._calculateMarketBuyERC20FillAmountAsync( @@ -145,7 +145,7 @@ export class ForwarderWrapper { feeProportion: number, makerAssetFillAmount: BigNumber, ): Promise<BigNumber> { - const makerAssetData = assetProxyUtils.decodeAssetDataOrThrow(orders[0].makerAssetData); + const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(orders[0].makerAssetData); const makerAssetToken = makerAssetData.tokenAddress; const params = formatters.createMarketBuyOrders(orders, makerAssetFillAmount); |