aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/asset_proxy
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-23 02:18:50 +0800
committerFabio Berger <me@fabioberger.com>2018-05-23 02:18:50 +0800
commita682b5d90e4c651e4e5d5d7c700237a9b6fe22bf (patch)
tree35690db865d8ed5ba859d9e0d9d1cd1050425c4f /packages/contracts/test/asset_proxy
parent4a0c8d72b05152ee2fd71245873d5a70f7281058 (diff)
downloaddexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar.gz
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar.bz2
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar.lz
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar.xz
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.tar.zst
dexon-sol-tools-a682b5d90e4c651e4e5d5d7c700237a9b6fe22bf.zip
Remove 0x.js dep from contracts
Diffstat (limited to 'packages/contracts/test/asset_proxy')
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts11
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 e7ef9a0d3..3c72968d3 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 () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const usedAddresses = ([owner, notAuthorized, exchangeAddress, makerAddress, takerAddress] = accounts);
@@ -61,10 +58,6 @@ describe('Asset Transfer Proxies', () => {
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchangeAddress, {
from: owner,
});
-
- zeroEx = new ZeroEx(provider, {
- networkId: constants.TESTRPC_NETWORK_ID,
- });
});
beforeEach(async () => {
await blockchainLifecycle.startAsync();
@@ -179,7 +172,7 @@ describe('Asset Transfer Proxies', () => {
amounts,
{ from: exchangeAddress },
);
- const res = await zeroEx.awaitTransactionMinedAsync(txHash);
+ const res = await web3Wrapper.awaitTransactionMinedAsync(txHash);
const newBalances = await erc20Wrapper.getBalancesAsync();
expect(res.logs.length).to.equal(numTransfers);
@@ -356,7 +349,7 @@ describe('Asset Transfer Proxies', () => {
amounts,
{ from: exchangeAddress },
);
- const res = await zeroEx.awaitTransactionMinedAsync(txHash);
+ const res = await web3Wrapper.awaitTransactionMinedAsync(txHash);
expect(res.logs.length).to.equal(numTransfers);
const newOwnerMakerAssetA = await erc721Token.ownerOf.callAsync(makerTokenIdA);