diff options
| -rw-r--r-- | src/0x.ts | 12 | ||||
| -rw-r--r-- | test/exchange_wrapper_test.ts | 3 | ||||
| -rw-r--r-- | test/proxy_wrapper_test.ts | 3 |
3 files changed, 10 insertions, 8 deletions
@@ -52,7 +52,11 @@ export class ZeroEx { * wrapped ETH ERC20 token smart contract. */ public etherToken: EtherTokenWrapper; - private _proxyWrapper: ProxyWrapper; + /** + * An instance of the ProxyWrapper class containing methods for interacting with the + * proxy smart contract. + */ + public proxy: ProxyWrapper; private _web3Wrapper: Web3Wrapper; /** * Verifies that the elliptic curve signature `signature` was generated @@ -150,8 +154,8 @@ export class ZeroEx { constructor(provider: Web3Provider) { this._web3Wrapper = new Web3Wrapper(provider); this.token = new TokenWrapper(this._web3Wrapper); - this._proxyWrapper = new ProxyWrapper(this._web3Wrapper); - this.exchange = new ExchangeWrapper(this._web3Wrapper, this.token, this._proxyWrapper); + this.proxy = new ProxyWrapper(this._web3Wrapper); + this.exchange = new ExchangeWrapper(this._web3Wrapper, this.token, this.proxy); this.tokenRegistry = new TokenRegistryWrapper(this._web3Wrapper); this.etherToken = new EtherTokenWrapper(this._web3Wrapper, this.token); } @@ -165,7 +169,7 @@ export class ZeroEx { await this.exchange.invalidateContractInstancesAsync(); this.tokenRegistry.invalidateContractInstance(); this.token.invalidateContractInstances(); - this._proxyWrapper.invalidateContractInstance(); + this.proxy.invalidateContractInstance(); } /** * Get user Ethereum addresses available through the supplied web3 instance available for sending transactions. diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 5833a8c23..c775f6789 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -828,8 +828,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..ecda09e57 100644 --- a/test/proxy_wrapper_test.ts +++ b/test/proxy_wrapper_test.ts @@ -15,8 +15,7 @@ describe('ProxyWrapper', () => { }); 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(); }); }); |