From 63cd5a629615bd1f30a8cb0e57649efcaefcd940 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 11 May 2018 15:24:31 +0200 Subject: Get rid of hack --- packages/0x.js/src/0x.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts index a4ca3efc2..8883dca53 100644 --- a/packages/0x.js/src/0x.ts +++ b/packages/0x.js/src/0x.ts @@ -162,8 +162,8 @@ export class ZeroEx { * @return An array of available user Ethereum addresses. */ public async getAvailableAddressesAsync(): Promise { - // Hack: Get Web3Wrapper from ZeroExContract - const web3Wrapper: Web3Wrapper = (this._contractWrappers as any)._web3Wrapper; + const provider = this._contractWrappers.getProvider(); + const web3Wrapper = new Web3Wrapper(provider); const availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); return availableAddresses; } @@ -203,8 +203,8 @@ export class ZeroEx { pollingIntervalMs = 1000, timeoutMs?: number, ): Promise { - // Hack: Get Web3Wrapper from ZeroExContract - const web3Wrapper: Web3Wrapper = (this._contractWrappers as any)._web3Wrapper; + const provider = this._contractWrappers.getProvider(); + const web3Wrapper = new Web3Wrapper(provider); const transactionReceiptWithDecodedLogs = await web3Wrapper.awaitTransactionMinedAsync( txHash, pollingIntervalMs, @@ -219,10 +219,9 @@ export class ZeroEx { * @return An instance of the 0x.js OrderWatcher class. */ public async createOrderWatcherAsync(config?: OrderWatcherConfig): Promise { - // Hack: Get Web3Wrapper from ZeroExContract - const web3Wrapper: Web3Wrapper = (this._contractWrappers as any)._web3Wrapper; - const networkId = await web3Wrapper.getNetworkIdAsync(); const provider = this._contractWrappers.getProvider(); + const web3Wrapper = new Web3Wrapper(provider); + const networkId = await web3Wrapper.getNetworkIdAsync(); const orderWatcher = new OrderWatcher(provider, networkId, config); return orderWatcher; } -- cgit v1.2.3