diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-05 09:14:44 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:39:38 +0800 |
| commit | 12e2bfc794831c0008bdbfc27dad9509f2578057 (patch) | |
| tree | 550261bcf4060337c3f83ab6312c13c653a8d7db /packages/contracts/test/asset_proxy/proxies.ts | |
| parent | 6e5abade3cad23838fae3108a8de48a1972a9f75 (diff) | |
| download | dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.gz dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.bz2 dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.lz dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.xz dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.zst dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.zip | |
Fixes after rebasing
Diffstat (limited to 'packages/contracts/test/asset_proxy/proxies.ts')
| -rw-r--r-- | packages/contracts/test/asset_proxy/proxies.ts | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts index 6dc652383..52a92718b 100644 --- a/packages/contracts/test/asset_proxy/proxies.ts +++ b/packages/contracts/test/asset_proxy/proxies.ts @@ -1,6 +1,6 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetProxyUtils } from '@0xproject/order-utils'; import { generatePseudoRandomSalt } from '@0xproject/order-utils'; +import { assetProxyUtils } from '@0xproject/order-utils'; import { AssetProxyId } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; @@ -18,13 +18,11 @@ import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c2 import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy'; import { artifacts } from '../../src/utils/artifacts'; import { expectRevertOrAlwaysFailingTransactionAsync } from '../../src/utils/assertions'; -import { assetProxyUtils } from '../../src/utils/asset_proxy_utils'; import { chaiSetup } from '../../src/utils/chai_setup'; import { constants } from '../../src/utils/constants'; import { ERC20Wrapper } from '../../src/utils/erc20_wrapper'; import { ERC721Wrapper } from '../../src/utils/erc721_wrapper'; import { LogDecoder } from '../../src/utils/log_decoder'; -import { AssetProxyId } from '../../src/utils/types'; import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper'; chaiSetup.configure(); |