diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-24 01:19:10 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-24 01:19:10 +0800 |
commit | 0a725415a48ebc2f23578baa410f56f88bc77cee (patch) | |
tree | c4a618bb0700560d23b7839b60ba2203e46433f9 /packages/contracts/test/asset_proxy | |
parent | 48e66954470ffb1b547e377d3edbed5d2cf7fc6b (diff) | |
parent | af0d9439d4f4e05fce8018665e375cf2db07184c (diff) | |
download | dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.gz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.bz2 dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.lz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.xz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.zst dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.zip |
Merge branch 'v2-prototype' into feature/truffle-sol-cov
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); |