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/order-watcher/test/expiration_watcher_test.ts | |
parent | 5044fe4fe4486f67408572cf6807482aecf7f6c9 (diff) | |
download | dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.gz dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.bz2 dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.lz dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.xz dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.zst dexon-sol-tools-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.zip |
Fix a bad merge
Diffstat (limited to 'packages/order-watcher/test/expiration_watcher_test.ts')
-rw-r--r-- | packages/order-watcher/test/expiration_watcher_test.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/order-watcher/test/expiration_watcher_test.ts b/packages/order-watcher/test/expiration_watcher_test.ts index f765e8278..ea9923487 100644 --- a/packages/order-watcher/test/expiration_watcher_test.ts +++ b/packages/order-watcher/test/expiration_watcher_test.ts @@ -2,7 +2,7 @@ import { ContractWrappers } from '@0xproject/contract-wrappers'; import { tokenUtils } from '@0xproject/contract-wrappers/lib/test/utils/token_utils'; 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 } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; @@ -56,8 +56,8 @@ describe('ExpirationWatcher', () => { [coinbase, makerAddress, takerAddress, feeRecipient] = userAddresses; const [makerTokenAddress, takerTokenAddress] = tokenUtils.getDummyERC20TokenAddresses(); [makerAssetData, takerAssetData] = [ - assetProxyUtils.encodeERC20AssetData(makerTokenAddress), - assetProxyUtils.encodeERC20AssetData(takerTokenAddress), + assetDataUtils.encodeERC20AssetData(makerTokenAddress), + assetDataUtils.encodeERC20AssetData(takerTokenAddress), ]; }); after(async () => { |