aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-wrappers
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 21:40:45 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 21:40:45 +0800
commit5044fe4fe4486f67408572cf6807482aecf7f6c9 (patch)
tree59f455c6815059fd4fb011506624c10327b7db61 /packages/contract-wrappers
parent8e49169e6b3233cdc39d1867104cd0ec043c600a (diff)
parente2fb49a8f871fd4b631bb01bb641c632b7c19435 (diff)
downloaddexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.gz
dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.zst
dexon-0x-contracts-5044fe4fe4486f67408572cf6807482aecf7f6c9.zip
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/contract-wrappers')
-rw-r--r--packages/contract-wrappers/test/exchange_wrapper_test.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts
index 44f8a5680..dca212f65 100644
--- a/packages/contract-wrappers/test/exchange_wrapper_test.ts
+++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils';
import { FillScenarios } from '@0xproject/fill-scenarios';
-import { assetProxyUtils, orderHashUtils } from '@0xproject/order-utils';
+import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
import { DoneCallback, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
@@ -66,8 +66,8 @@ describe('ExchangeWrapper', () => {
[coinbase, makerAddress, takerAddress, feeRecipient, anotherMakerAddress] = userAddresses;
[makerTokenAddress, takerTokenAddress] = tokenUtils.getDummyERC20TokenAddresses();
[makerAssetData, takerAssetData] = [
- assetProxyUtils.encodeERC20AssetData(makerTokenAddress),
- assetProxyUtils.encodeERC20AssetData(takerTokenAddress),
+ assetDataUtils.encodeERC20AssetData(makerTokenAddress),
+ assetDataUtils.encodeERC20AssetData(takerTokenAddress),
];
signedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerAssetData,