Merge branch 'master' into subscribe-token

2 files changed, 13 insertions, 4 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 2682c5d52..3a88db5c9 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -832,8 +832,7 @@ describe('ExchangeWrapper', () => {
             const exchangeAddresses = await zeroEx.exchange.getProxyAuthorizedContractAddressesAsync();
             for (const exchangeAddress of exchangeAddresses) {
                 assert.isETHAddressHex('exchangeAddress', exchangeAddress);
-                const proxyWrapper = (zeroEx as any)._proxyWrapper as ProxyWrapper;
-                const isAuthorized = await proxyWrapper.isAuthorizedAsync(exchangeAddress);
+                const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(exchangeAddress);
                 expect(isAuthorized).to.be.true();
             }
         });
diff --git a/test/proxy_wrapper_test.ts b/test/proxy_wrapper_test.ts
index 29b5776c6..c60159b81 100644
--- a/test/proxy_wrapper_test.ts
+++ b/test/proxy_wrapper_test.ts
@@ -9,15 +9,25 @@ const expect = chai.expect;
 
 describe('ProxyWrapper', () => {
     let zeroEx: ZeroEx;
+    let exchangeContractAddress: string;
     before(async () => {
         const web3 = web3Factory.create();
         zeroEx = new ZeroEx(web3.currentProvider);
+        [exchangeContractAddress] = await zeroEx.exchange.getAvailableContractAddressesAsync();
     });
     describe('#isAuthorizedAsync', () => {
         it('should return false if the address is not authorized', async () => {
-            const proxyWrapper = (zeroEx as any)._proxyWrapper as ProxyWrapper;
-            const isAuthorized = await proxyWrapper.isAuthorizedAsync(ZeroEx.NULL_ADDRESS);
+            const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(ZeroEx.NULL_ADDRESS);
             expect(isAuthorized).to.be.false();
         });
     });
+    describe('#getAuthorizedAddressesAsync', () => {
+        it('should return the list of authorized addresses', async () => {
+            const authorizedAddresses = await zeroEx.proxy.getAuthorizedAddressesAsync(exchangeContractAddress);
+            for (const authorizedAddress of authorizedAddresses) {
+                const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(authorizedAddress);
+                expect(isAuthorized).to.be.true();
+            }
+        });
+    });
 });