aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-04-05 19:19:14 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-04-05 19:52:19 +0800
commitb99c797945dacae09be1e1e2d58f806423fedffa (patch)
treecbaae6089347793d7b205d696d517cf2e1de38ab
parent59edca41666851dc84a32330f1d978772818da9d (diff)
downloaddexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar.gz
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar.bz2
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar.lz
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar.xz
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.tar.zst
dexon-sol-tools-b99c797945dacae09be1e1e2d58f806423fedffa.zip
Fix tests
-rw-r--r--packages/0x.js/test/ether_token_wrapper_test.ts3
-rw-r--r--packages/contracts/test/exchange/wrapper.ts1
-rw-r--r--packages/contracts/test/utils/deployer.ts3
3 files changed, 3 insertions, 4 deletions
diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index 23592f92e..644101dc7 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -1,5 +1,6 @@
import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import 'mocha';
import * as Web3 from 'web3';
@@ -105,7 +106,7 @@ describe('EtherTokenWrapper', () => {
it('should throw if user has insufficient ETH balance for deposit', async () => {
const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
- const extraETHBalance = Web3Wrapper.toWei(5, 'ether');
+ const extraETHBalance = Web3Wrapper.toWei(new BigNumber(5));
const overETHBalanceinWei = preETHBalance.add(extraETHBalance);
return expect(
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index d4029c8cd..c658dca79 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -73,7 +73,6 @@ describe('Exchange', () => {
const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
zrx.address,
tokenTransferProxy.address,
- provider,
]);
exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] });
diff --git a/packages/contracts/test/utils/deployer.ts b/packages/contracts/test/utils/deployer.ts
index 1baa47f09..45f79a2a4 100644
--- a/packages/contracts/test/utils/deployer.ts
+++ b/packages/contracts/test/utils/deployer.ts
@@ -7,9 +7,8 @@ import { constants } from '../../util/constants';
import { web3 } from './web3_wrapper';
const deployerOpts = {
- web3Provider: web3.currentProvider,
+ provider: web3.currentProvider,
artifactsDir: path.resolve('src', 'artifacts'),
- jsonrpcUrl: devConstants.RPC_URL,
networkId: constants.TESTRPC_NETWORK_ID,
defaults: {
gas: devConstants.GAS_ESTIMATE,