aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
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/exchange/transactions.ts
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/exchange/transactions.ts')
-rw-r--r--packages/contracts/test/exchange/transactions.ts12
1 files changed, 2 insertions, 10 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 482475554..cd18b60ed 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -1,5 +1,3 @@
-import { ZeroEx } from '0x.js';
-
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
@@ -59,8 +57,6 @@ describe('Exchange transactions', () => {
let defaultMakerTokenAddress: string;
let defaultTakerTokenAddress: string;
- let zeroEx: ZeroEx;
-
before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const usedAddresses = ([owner, senderAddress, makerAddress, takerAddress, feeRecipientAddress] = accounts);
@@ -77,11 +73,7 @@ describe('Exchange transactions', () => {
txDefaults,
assetProxyUtils.encodeERC20ProxyData(zrxToken.address),
);
- zeroEx = new ZeroEx(provider, {
- exchangeContractAddress: exchange.address,
- networkId: constants.TESTRPC_NETWORK_ID,
- });
- exchangeWrapper = new ExchangeWrapper(exchange, zeroEx);
+ exchangeWrapper = new ExchangeWrapper(exchange);
await exchangeWrapper.registerAssetProxyAsync(AssetProxyId.ERC20, erc20Proxy.address, owner);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner });
@@ -179,7 +171,7 @@ describe('Exchange transactions', () => {
it('should reset the currentContextAddress', async () => {
await exchangeWrapper.executeTransactionAsync(signedTx, senderAddress);
const currentContextAddress = await exchange.currentContextAddress.callAsync();
- expect(currentContextAddress).to.equal(ZeroEx.NULL_ADDRESS);
+ expect(currentContextAddress).to.equal(constants.NULL_ADDRESS);
});
});