From d789aa24aa2c9f4e0d17a382fe9cb8d56ab27957 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 15 Jun 2017 17:05:03 +0200 Subject: Make ZeroEx constructor accept Web3Provider instead of Web3 instance --- test/0x.js_test.ts | 6 +++--- test/assert_test.ts | 2 +- test/exchange_wrapper_test.ts | 2 +- test/token_registry_wrapper_test.ts | 2 +- test/token_wrapper_test.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts index 58f5c8533..005b9fa0c 100644 --- a/test/0x.js_test.ts +++ b/test/0x.js_test.ts @@ -15,7 +15,7 @@ describe('ZeroEx library', () => { describe('#setProvider', () => { it('overrides provider in nested web3s and invalidates contractInstances', async () => { const web3 = web3Factory.create(); - const zeroEx = new ZeroEx(web3); + const zeroEx = new ZeroEx(web3.currentProvider); // Instantiate the contract instances with the current provider await (zeroEx.exchange as any)._getExchangeContractAsync(); await (zeroEx.tokenRegistry as any)._getTokenRegistryContractAsync(); @@ -51,7 +51,7 @@ describe('ZeroEx library', () => { }; const address = '0x5409ed021d9299bf6814279a6a1411a7e866a631'; const web3 = web3Factory.create(); - const zeroEx = new ZeroEx(web3); + const zeroEx = new ZeroEx(web3.currentProvider); it('should return false if the data doesn\'t pertain to the signature & address', async () => { expect(ZeroEx.isValidSignature('0x0', signature, address)).to.be.false(); return expect( @@ -149,7 +149,7 @@ describe('ZeroEx library', () => { }); it('calculates the order hash', async () => { const web3 = web3Factory.create(); - const zeroEx = new ZeroEx(web3); + const zeroEx = new ZeroEx(web3.currentProvider); stubs = [ Sinon.stub((zeroEx as any), '_getExchangeAddressAsync') diff --git a/test/assert_test.ts b/test/assert_test.ts index 25d9a8d16..6a8d30716 100644 --- a/test/assert_test.ts +++ b/test/assert_test.ts @@ -8,7 +8,7 @@ const expect = chai.expect; describe('Assertion library', () => { const web3 = web3Factory.create(); - const zeroEx = new ZeroEx(web3); + const zeroEx = new ZeroEx(web3.currentProvider); describe('#isSenderAddressHexAsync', () => { it('throws when address is invalid', async () => { const address = '0xdeadbeef'; diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 28a5c719e..e4b2e3f86 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -39,7 +39,7 @@ describe('ExchangeWrapper', () => { let fillScenarios: FillScenarios; before(async () => { web3 = web3Factory.create(); - zeroEx = new ZeroEx(web3); + zeroEx = new ZeroEx(web3.currentProvider); userAddresses = await promisify(web3.eth.getAccounts)(); tokens = await zeroEx.tokenRegistry.getTokensAsync(); tokenUtils = new TokenUtils(tokens); diff --git a/test/token_registry_wrapper_test.ts b/test/token_registry_wrapper_test.ts index 158a02596..da436161c 100644 --- a/test/token_registry_wrapper_test.ts +++ b/test/token_registry_wrapper_test.ts @@ -18,7 +18,7 @@ describe('TokenRegistryWrapper', () => { let zeroEx: ZeroEx; before(async () => { const web3 = web3Factory.create(); - zeroEx = new ZeroEx(web3); + zeroEx = new ZeroEx(web3.currentProvider); }); beforeEach(async () => { await blockchainLifecycle.startAsync(); diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts index 308d3b634..a1c035672 100644 --- a/test/token_wrapper_test.ts +++ b/test/token_wrapper_test.ts @@ -21,7 +21,7 @@ describe('TokenWrapper', () => { let addressWithoutFunds: string; before(async () => { web3 = web3Factory.create(); - zeroEx = new ZeroEx(web3); + zeroEx = new ZeroEx(web3.currentProvider); userAddresses = await promisify(web3.eth.getAccounts)(); tokens = await zeroEx.tokenRegistry.getTokensAsync(); coinbase = userAddresses[0]; -- cgit v1.2.3