Move functions out of Forwarder.sol

1 files changed, 2 insertions, 30 deletions

diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
index 32b79d582..fc17a4c72 100644
--- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
+++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
@@ -25,11 +25,9 @@ import "./MixinConstants.sol";
 import "./MixinMarketBuyZrx.sol";
 import "./MixinExpectedResults.sol";
 import "./MixinTransfer.sol";
-import "../utils/Ownable/Ownable.sol";
 
 
 contract Forwarder is
-    Ownable,
     MixinConstants,
     MixinExpectedResults,
     MixinFees,
@@ -37,7 +35,6 @@ contract Forwarder is
     MixinTransfer,
     MixinForwarderCore
 {
-    uint256 constant internal MAX_UINT = 2**256 - 1;
 
     constructor (
         address _exchange,
@@ -48,7 +45,6 @@ contract Forwarder is
         bytes memory _wethAssetData
     )
         public
-        Ownable()
         MixinConstants(
             _exchange,
             _etherToken,
@@ -56,30 +52,6 @@ contract Forwarder is
             _zrxAssetData,
             _wethAssetData
         )
-    {
-        setERC20ProxyApproval(_erc20AssetProxyId);
-    }
-
-    /// @dev Default payabale function, this allows us to withdraw WETH
-    function ()
-        public
-        payable
-    {
-        require(
-            msg.sender == address(ETHER_TOKEN),
-            "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY"
-        );
-    }
-
-    /// @dev Sets the allowances to the proxy for this contract
-    function setERC20ProxyApproval(bytes4 erc20AssetProxyId)
-        public
-        onlyOwner
-    {
-        address proxyAddress = EXCHANGE.getAssetProxy(erc20AssetProxyId);
-        if (proxyAddress != address(0)) {
-            ETHER_TOKEN.approve(proxyAddress, MAX_UINT);
-            ZRX_TOKEN.approve(proxyAddress, MAX_UINT);
-        }
-    }
+        MixinForwarderCore()
+    {}
 }