diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-24 00:04:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-24 00:04:59 +0800 |
commit | f3fe9661f65f5ac58d45e965b7be02e9738df1c4 (patch) | |
tree | aeff401cb16007a30c08e9e3a980bb4904257f6a /packages/contracts/test/asset_proxy | |
parent | e7e8773cd43121cdedff6151d379503ff899e595 (diff) | |
parent | 17cfd7b001a046e1014257da6b77b28c7a291e54 (diff) | |
download | dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar.gz dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar.bz2 dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar.lz dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar.xz dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.tar.zst dexon-sol-tools-f3fe9661f65f5ac58d45e965b7be02e9738df1c4.zip |
Merge pull request #609 from 0xProject/refactor/contracts/remove0xjsDep
Remove 0x.js dep from Contracts
Diffstat (limited to 'packages/contracts/test/asset_proxy')
-rw-r--r-- | packages/contracts/test/asset_proxy/proxies.ts | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts index 0f3080c99..4ee38db80 100644 --- a/packages/contracts/test/asset_proxy/proxies.ts +++ b/packages/contracts/test/asset_proxy/proxies.ts @@ -1,4 +1,3 @@ -import { ZeroEx } from '0x.js'; import { BlockchainLifecycle } from '@0xproject/dev-utils'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; @@ -37,8 +36,6 @@ describe('Asset Transfer Proxies', () => { let erc721Wrapper: ERC721Wrapper; let erc721MakerTokenId: BigNumber; - let zeroEx: ZeroEx; - before(async () => { await blockchainLifecycle.startAsync(); }); @@ -73,10 +70,6 @@ describe('Asset Transfer Proxies', () => { }), constants.AWAIT_TRANSACTION_MINED_MS, ); - - zeroEx = new ZeroEx(provider, { - networkId: constants.TESTRPC_NETWORK_ID, - }); }); beforeEach(async () => { await blockchainLifecycle.startAsync(); @@ -200,7 +193,7 @@ describe('Asset Transfer Proxies', () => { amounts, { from: exchangeAddress }, ); - const res = await zeroEx.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); + const res = await web3Wrapper.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); const newBalances = await erc20Wrapper.getBalancesAsync(); expect(res.logs.length).to.equal(numTransfers); @@ -383,7 +376,7 @@ describe('Asset Transfer Proxies', () => { amounts, { from: exchangeAddress }, ); - const res = await zeroEx.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); + const res = await web3Wrapper.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); expect(res.logs.length).to.equal(numTransfers); const newOwnerMakerAssetA = await erc721Token.ownerOf.callAsync(makerTokenIdA); |