From 27fb51d37ff9f7db7c7deba4e0d3734bfb73c256 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Sat, 16 Nov 2019 00:26:01 -0500 Subject: [PATCH] `@0x/contracts-asset-proxy`: Tweak `IUniswapExchangeFactory`. --- contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol | 4 +++- .../contracts/src/interfaces/IUniswapExchangeFactory.sol | 2 +- contracts/asset-proxy/contracts/test/TestUniswapBridge.sol | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol b/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol index 6e6d325522..23fb69c47c 100644 --- a/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol +++ b/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol @@ -210,7 +210,9 @@ contract UniswapBridge is if (fromTokenAddress == address(getWethContract())) { exchangeTokenAddress = toTokenAddress; } - exchange = getUniswapExchangeFactoryContract().getExchange(exchangeTokenAddress); + exchange = IUniswapExchange( + getUniswapExchangeFactoryContract().getExchange(exchangeTokenAddress) + ); require(address(exchange) != address(0), "NO_UNISWAP_EXCHANGE_FOR_TOKEN"); return exchange; } diff --git a/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol b/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol index c175f55326..d91c5319d5 100644 --- a/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol +++ b/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol @@ -28,5 +28,5 @@ interface IUniswapExchangeFactory { function getExchange(address tokenAddress) external view - returns (IUniswapExchange); + returns (address); } diff --git a/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol b/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol index 9f67714a1b..db3a14a254 100644 --- a/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol +++ b/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol @@ -407,9 +407,9 @@ contract TestUniswapBridge is function getExchange(address tokenAddress) external view - returns (IUniswapExchange) + returns (address) { - return IUniswapExchange(_testExchanges[tokenAddress]); + return address(_testExchanges[tokenAddress]); } // @dev Use `wethToken`.