2 files changed, 30 insertions, 3 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index c45c70991..1e76ae71a 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -4,6 +4,7 @@ import 'mocha';
 import * as BigNumber from 'bignumber.js';
 import ChaiBigNumber = require('chai-bignumber');
 import * as Sinon from 'sinon';
+import ProviderEngine = require('web3-provider-engine');
 import {ZeroEx} from '../src/0x.js';
 import {constants} from './utils/constants';
 import {web3Factory} from './utils/web3_factory';
@@ -13,6 +14,28 @@ chai.use(ChaiBigNumber());
 const expect = chai.expect;
 
 describe('ZeroEx library', () => {
+    describe('#setProvider', () => {
+        it('overrides the provider in the nested web3 instance and invalidates contractInstances', async () => {
+            const web3 = web3Factory.create();
+            const zeroEx = new ZeroEx(web3);
+            // Instantiate the exchangeContract instance with the current provider
+            await (zeroEx.exchange as any).instantiateExchangeContractIfDoesntExistAsync();
+
+            const newProvider = web3Factory.getRpcProvider();
+            // Add property to newProvider so that we can differentiate it from old provider
+            (newProvider as any).zeroExTestId = 1;
+            zeroEx.setProvider(newProvider);
+
+            // Check that exchangeContract instance removed after provider update
+            expect((zeroEx.exchange as any).exchangeContractIfExists).to.be.an('undefined');
+
+            // Check that all nested web3 instances return the updated provider
+            const nestedWeb3WrapperProvider = (zeroEx as any).web3Wrapper.getCurrentProvider();
+            expect((nestedWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
+            const contractWrapperWeb3WrapperProvider = zeroEx.exchange.web3Wrapper.getCurrentProvider();
+            expect((nestedWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
+        });
+    });
     describe('#getOrderHash', () => {
         const expectedOrderHash = '0x103a5e97dab5dbeb8f385636f86a7d1e458a7ccbe1bd194727f0b2f85ab116c7';
         it('defaults takerAddress to NULL address', () => {
diff --git a/test/utils/web3_factory.ts b/test/utils/web3_factory.ts
index 493fbc2df..ffdc0e4cf 100644
--- a/test/utils/web3_factory.ts
+++ b/test/utils/web3_factory.ts
@@ -10,14 +10,18 @@ import {constants} from './constants';
 
 export const web3Factory = {
     create(): Web3 {
+        const provider = this.getRpcProvider();
+        const web3 = new Web3();
+        web3.setProvider(provider);
+        return web3;
+    },
+    getRpcProvider(): Web3.Provider {
         const provider = new ProviderEngine();
         const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`;
         provider.addProvider(new RpcSubprovider({
             rpcUrl,
         }));
         provider.start();
-        const web3 = new Web3();
-        web3.setProvider(provider);
-        return web3;
+        return provider;
     },
 };