aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-24 00:04:59 +0800
committerGitHub <noreply@github.com>2018-05-24 00:04:59 +0800
commitf3fe9661f65f5ac58d45e965b7be02e9738df1c4 (patch)
treeaeff401cb16007a30c08e9e3a980bb4904257f6a /packages/contracts/test/exchange/transactions.ts
parente7e8773cd43121cdedff6151d379503ff899e595 (diff)
parent17cfd7b001a046e1014257da6b77b28c7a291e54 (diff)
downloaddexon-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/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 798c8283b..203c05e53 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 () => {
await blockchainLifecycle.startAsync();
});
@@ -83,11 +79,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, provider);
await exchangeWrapper.registerAssetProxyAsync(AssetProxyId.ERC20, erc20Proxy.address, owner);
await web3Wrapper.awaitTransactionMinedAsync(
@@ -188,7 +180,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);
});
});