From 3733d503dbc801c2552bbf9253e80d3c37df1cb6 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Thu, 3 Sep 2020 01:21:09 -0400 Subject: [PATCH] `@0x/contracts-zero-ex`: Remove `mooniswapRegistry` from `BridgeAdapter` addreses --- .../bridges/mixins/MixinAdapterAddresses.sol | 1 - .../bridges/mixins/MixinMooniswap.sol | 15 --------------- .../transformers/fill_quote_transformer_test.ts | 1 - 3 files changed, 17 deletions(-) diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol index e83ceebf41..7a08ad2973 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol @@ -37,7 +37,6 @@ contract MixinAdapterAddresses address uniswapV2Router; address uniswapExchangeFactory; address mStable; - address mooniswapRegistry; // Other address weth; } diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol index 6f733b8439..c58f41b137 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol @@ -41,18 +41,6 @@ interface IMooniswapPool { returns (uint256 boughtAmount); } -/// @dev Moooniswap registry interface. -interface IMooniswapRegistry { - - function pools( - IERC20TokenV06 token1, - IERC20TokenV06 token2 - ) - external - view - returns (IMooniswapPool); -} - /// @dev BridgeAdapter mixin for mooniswap. contract MixinMooniswap is MixinAdapterAddresses @@ -60,15 +48,12 @@ contract MixinMooniswap is using LibERC20TokenV06 for IERC20TokenV06; using LibERC20TokenV06 for IEtherTokenV06; - /// @dev Mooniswap registry contract. - IMooniswapRegistry private immutable REGISTRY; /// @dev WETH token. IEtherTokenV06 private immutable WETH; constructor(AdapterAddresses memory addresses) public { - REGISTRY = IMooniswapRegistry(addresses.mooniswapRegistry); WETH = IEtherTokenV06(addresses.weth); } diff --git a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts index c7c159af4a..3ad6c5a6d4 100644 --- a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts +++ b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts @@ -72,7 +72,6 @@ blockchainTests.resets('FillQuoteTransformer', env => { uniswapV2Router: NULL_ADDRESS, uniswapExchangeFactory: NULL_ADDRESS, mStable: NULL_ADDRESS, - mooniswapRegistry: NULL_ADDRESS, weth: NULL_ADDRESS, }, );