crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Leonid Logvinov
2018-04-05 13:19:14 +02:00
parent 59edca4166
commit b99c797945
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/0x.js/test/ether_token_wrapper_test.ts
View File

@@ -1,5 +1,6 @@
import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils'; import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils'; import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai'; import * as chai from 'chai';
import 'mocha'; import 'mocha';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
@@ -105,7 +106,7 @@ describe('EtherTokenWrapper', () => {
it('should throw if user has insufficient ETH balance for deposit', async () => { it('should throw if user has insufficient ETH balance for deposit', async () => {
const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH); 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); const overETHBalanceinWei = preETHBalance.add(extraETHBalance);
return expect( return expect(

1
packages/contracts/test/exchange/wrapper.ts
View File

@@ -73,7 +73,6 @@ describe('Exchange', () => {
const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [ const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
zrx.address, zrx.address,
tokenTransferProxy.address, tokenTransferProxy.address,
provider,
]); ]);
exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider); exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] }); await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] });

3
packages/contracts/test/utils/deployer.ts
View File

@@ -7,9 +7,8 @@ import { constants } from '../../util/constants';
import { web3 } from './web3_wrapper'; import { web3 } from './web3_wrapper';
const deployerOpts = { const deployerOpts = {
web3Provider: web3.currentProvider, provider: web3.currentProvider,
artifactsDir: path.resolve('src', 'artifacts'), artifactsDir: path.resolve('src', 'artifacts'),
jsonrpcUrl: devConstants.RPC_URL,
networkId: constants.TESTRPC_NETWORK_ID, networkId: constants.TESTRPC_NETWORK_ID,
defaults: { defaults: {
gas: devConstants.GAS_ESTIMATE, gas: devConstants.GAS_ESTIMATE,