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/exchange/transactions.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/exchange/transactions.ts')
| -rw-r--r-- | packages/contracts/test/exchange/transactions.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index 831576cd2..2bdd96b16 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -1,5 +1,5 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetProxyUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; +import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; @@ -88,7 +88,7 @@ describe('Exchange transactions', () => { artifacts.Exchange, provider, txDefaults, - assetProxyUtils.encodeERC20AssetData(zrxToken.address), + assetDataUtils.encodeERC20AssetData(zrxToken.address), ); exchangeWrapper = new ExchangeWrapper(exchange, provider); await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner); @@ -107,8 +107,8 @@ describe('Exchange transactions', () => { exchangeAddress: exchange.address, makerAddress, feeRecipientAddress, - makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerTokenAddress), - takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerTokenAddress), + makerAssetData: assetDataUtils.encodeERC20AssetData(defaultMakerTokenAddress), + takerAssetData: assetDataUtils.encodeERC20AssetData(defaultTakerTokenAddress), }; makerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)]; takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)]; @@ -349,8 +349,8 @@ describe('Exchange transactions', () => { exchangeAddress: exchange.address, makerAddress, feeRecipientAddress, - makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerTokenAddress), - takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerTokenAddress), + makerAssetData: assetDataUtils.encodeERC20AssetData(defaultMakerTokenAddress), + takerAssetData: assetDataUtils.encodeERC20AssetData(defaultTakerTokenAddress), }; whitelistOrderFactory = new OrderFactory(makerPrivateKey, defaultOrderParams); }); |