From 3f9872d8b31723fc1ebd0c6bc466f28f006272c3 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 21 Feb 2019 16:07:23 -0800 Subject: [PATCH] Remove getZeroExProvider method since it can be confusing --- .../exchange/test/utils/fill_order_combinatorial_utils.ts | 5 +++-- packages/web3-wrapper/src/web3_wrapper.ts | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts index 9c356a1bac..f104b72134 100644 --- a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts +++ b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts @@ -26,7 +26,7 @@ import { OrderValidationUtils, } from '@0x/order-utils'; import { AssetProxyId, RevertReason, SignatureType, SignedOrder } from '@0x/types'; -import { BigNumber, errorUtils, logUtils } from '@0x/utils'; +import { BigNumber, errorUtils, logUtils, providerUtils } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { LogWithDecodedArgs, TxData } from 'ethereum-types'; @@ -60,7 +60,8 @@ export async function fillOrderCombinatorialUtilsFactoryAsync( const [ownerAddress, makerAddress, takerAddress] = userAddresses; const makerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[userAddresses.indexOf(makerAddress)]; - const provider = web3Wrapper.getZeroExProvider(); + const supportedProvider = web3Wrapper.getProvider(); + const provider = providerUtils.standardizeOrThrow(supportedProvider); const erc20Wrapper = new ERC20Wrapper(provider, userAddresses, ownerAddress); const erc721Wrapper = new ERC721Wrapper(provider, userAddresses, ownerAddress); diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index da6de7537c..8a8190ec93 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -171,13 +171,6 @@ export class Web3Wrapper { public getProvider(): SupportedProvider { return this._supportedProvider; } - /** - * Retrieve the Web3 provider - * @return Web3 provider instance - */ - public getZeroExProvider(): ZeroExProvider { - return this._provider; - } /** * Update the used Web3 provider * @param provider The new Web3 provider to be set