From e5bb3bc75eb2fe0e2a4adbd99d64362c305bdd3e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 29 Aug 2017 18:41:14 +0200 Subject: Add web3@1.0 to web3Factory --- test/utils/web3_factory.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test') diff --git a/test/utils/web3_factory.ts b/test/utils/web3_factory.ts index b20070c74..863fa1d07 100644 --- a/test/utils/web3_factory.ts +++ b/test/utils/web3_factory.ts @@ -6,6 +6,7 @@ import ProviderEngine = require('web3-provider-engine'); import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); import * as Web3 from 'web3'; +import * as Web3_beta from 'web3_beta'; import {constants} from './constants'; import {EmptyWalletSubProvider} from '../../src/subproviders/empty_wallet_subprovider'; @@ -16,6 +17,12 @@ export const web3Factory = { web3.setProvider(provider); return web3; }, + createBeta(): any { + const provider_beta = this.getProviderBeta(); + const web3_beta = new Web3_beta(); + web3_beta.setProvider(provider_beta); + return web3_beta; + }, getRpcProvider(hasAddresses: boolean = true): Web3.Provider { const provider = new ProviderEngine(); const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`; @@ -28,4 +35,9 @@ export const web3Factory = { provider.start(); return provider; }, + getProviderBeta(): any { + const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`; + const providerBeta = new Web3_beta.providers.HttpProvider(rpcUrl); + return providerBeta; + }, }; -- cgit v1.2.3 From 7d82d14a7d57566c5220a2342e21c755a9dc6a4a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 29 Aug 2017 18:41:29 +0200 Subject: Use zeroEx.getAvailableAddressesAsync instead of web3.eth.getAccounts --- test/ether_token_wrapper_test.ts | 2 +- test/exchange_wrapper_test.ts | 2 +- test/order_validation_test.ts | 2 +- test/token_wrapper_test.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/ether_token_wrapper_test.ts b/test/ether_token_wrapper_test.ts index b40061a41..601800cd1 100644 --- a/test/ether_token_wrapper_test.ts +++ b/test/ether_token_wrapper_test.ts @@ -33,7 +33,7 @@ describe('EtherTokenWrapper', () => { before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig); - userAddresses = await promisify(web3.eth.getAccounts)(); + userAddresses = await zeroEx.getAvailableAddressesAsync(); addressWithETH = userAddresses[0]; wethContractAddress = await zeroEx.etherToken.getContractAddressAsync(); depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5)); diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 080be774a..90ac37387 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -44,7 +44,7 @@ describe('ExchangeWrapper', () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider); exchangeContractAddress = await zeroEx.exchange.getContractAddressAsync(); - userAddresses = await promisify(web3.eth.getAccounts)(); + userAddresses = await zeroEx.getAvailableAddressesAsync(); tokens = await zeroEx.tokenRegistry.getTokensAsync(); tokenUtils = new TokenUtils(tokens); zrxTokenAddress = tokenUtils.getProtocolTokenOrThrow().address; diff --git a/test/order_validation_test.ts b/test/order_validation_test.ts index 8a6303f3a..93bcfcce0 100644 --- a/test/order_validation_test.ts +++ b/test/order_validation_test.ts @@ -37,7 +37,7 @@ describe('OrderValidation', () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider); exchangeContractAddress = await zeroEx.exchange.getContractAddressAsync(); - userAddresses = await promisify(web3.eth.getAccounts)(); + userAddresses = await zeroEx.getAvailableAddressesAsync(); [coinbase, makerAddress, takerAddress, feeRecipient] = userAddresses; tokens = await zeroEx.tokenRegistry.getTokensAsync(); tokenUtils = new TokenUtils(tokens); diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts index f4653e432..88833e612 100644 --- a/test/token_wrapper_test.ts +++ b/test/token_wrapper_test.ts @@ -34,7 +34,7 @@ describe('TokenWrapper', () => { before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider); - userAddresses = await promisify(web3.eth.getAccounts)(); + userAddresses = await zeroEx.getAvailableAddressesAsync(); tokens = await zeroEx.tokenRegistry.getTokensAsync(); tokenUtils = new TokenUtils(tokens); coinbase = userAddresses[0]; -- cgit v1.2.3 From da2661cf332a5d884184c376c2fedd3937a1b6ac Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 29 Aug 2017 18:42:13 +0200 Subject: Add tests for web3@1.0 --- test/web3_beta_test.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 test/web3_beta_test.ts (limited to 'test') diff --git a/test/web3_beta_test.ts b/test/web3_beta_test.ts new file mode 100644 index 000000000..2fe962555 --- /dev/null +++ b/test/web3_beta_test.ts @@ -0,0 +1,16 @@ +import * as chai from 'chai'; +import {chaiSetup} from './utils/chai_setup'; +import 'mocha'; +import {ZeroEx, Order, SubscriptionOpts, TokenEvents, ContractEvent} from '../src'; +import {web3Factory} from './utils/web3_factory'; + +chaiSetup.configure(); +const expect = chai.expect; + +describe('ZeroEx with beta web3', () => { + const web3_beta = web3Factory.createBeta(); + const zeroEx = new ZeroEx(web3_beta.currentProvider); + it('is able to make a call using a beta provider', async () => { + await zeroEx.tokenRegistry.getTokenAddressesAsync(); + }); +}); -- cgit v1.2.3 From 130a7967aa9c0e4fba5147e5a9c78516b91f78a8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 30 Aug 2017 10:56:46 +0200 Subject: Don't create whole web3 object in beta tests --- test/utils/web3_factory.ts | 8 +------- test/web3_beta_test.ts | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/utils/web3_factory.ts b/test/utils/web3_factory.ts index 863fa1d07..4785fa858 100644 --- a/test/utils/web3_factory.ts +++ b/test/utils/web3_factory.ts @@ -17,12 +17,6 @@ export const web3Factory = { web3.setProvider(provider); return web3; }, - createBeta(): any { - const provider_beta = this.getProviderBeta(); - const web3_beta = new Web3_beta(); - web3_beta.setProvider(provider_beta); - return web3_beta; - }, getRpcProvider(hasAddresses: boolean = true): Web3.Provider { const provider = new ProviderEngine(); const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`; @@ -35,7 +29,7 @@ export const web3Factory = { provider.start(); return provider; }, - getProviderBeta(): any { + getProviderBeta(): Web3.Provider { const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`; const providerBeta = new Web3_beta.providers.HttpProvider(rpcUrl); return providerBeta; diff --git a/test/web3_beta_test.ts b/test/web3_beta_test.ts index 2fe962555..e34812243 100644 --- a/test/web3_beta_test.ts +++ b/test/web3_beta_test.ts @@ -8,8 +8,8 @@ chaiSetup.configure(); const expect = chai.expect; describe('ZeroEx with beta web3', () => { - const web3_beta = web3Factory.createBeta(); - const zeroEx = new ZeroEx(web3_beta.currentProvider); + const web3_beta_provider = web3Factory.getProviderBeta(); + const zeroEx = new ZeroEx(web3_beta_provider); it('is able to make a call using a beta provider', async () => { await zeroEx.tokenRegistry.getTokenAddressesAsync(); }); -- cgit v1.2.3