update only addToken function for wrapper of enhanced conversion rate

Author: ilanDoron

contracts/wrappers/WrapConversionRateEnhancedSteps.sol

@@ -1,53 +1,15 @@
 pragma solidity 0.4.18;
 
-import "../ERC20Interface.sol";
-import "./WrapperBase.sol";
+import "./WrapConversionRate.sol";
 
 
-interface IConversionRatesEnhancedSteps {
-
-    function addOperator(address newOperator) public;
-    function addToken(ERC20 token) public;
-    function setTokenControlInfo(
-        ERC20 token,
-        uint minimalRecordResolution,
-        uint maxPerBlockImbalance,
-        uint maxTotalImbalance
-    ) public;
-    function setImbalanceStepFunction(
-        ERC20 token,
-        int[] xBuy,
-        int[] yBuy,
-        int[] xSell,
-        int[] ySell
-    ) public;
-    function enableTokenTrade(ERC20 token) public;
-    function setReserveAddress(address reserve) public;
-    function setValidRateDurationInBlocks(uint duration) public;
-    function getTokenControlInfo(ERC20 token) public view returns(uint, uint, uint);
-}
-
-
-contract WrapConversionRateEnhancedSteps is WrapperBase {
-
-    IConversionRatesEnhancedSteps internal conversionRates;
+contract WrapConversionRateEnhancedSteps is WrapConversionRate {
 
     //general functions
-    function WrapConversionRateEnhancedSteps(IConversionRatesEnhancedSteps _conversionRates) public
-        WrapperBase(PermissionGroups(address(_conversionRates)))
-    {
-        conversionRates = _conversionRates;
-    }
-
-    //overriding base
-    function claimWrappedContractAdmin() public onlyAdmin {
-        super.claimWrappedContractAdmin();
-        //for recurring claim, remove operator from wrapped contract
-        conversionRates.addOperator(this);
-    }
+    function WrapConversionRateEnhancedSteps(ConversionRates _conversionRates) public
+        WrapConversionRate(_conversionRates)
+    { /* empty block */ }
 
-    // add token functions
-    //////////////////////
     function addToken(
         ERC20 token,
         uint minRecordResolution,
@@ -79,67 +41,4 @@ contract WrapConversionRateEnhancedSteps is WrapperBase {
 
         conversionRates.enableTokenTrade(token);
     }
-
-    // enable trade per token
-    //////////////////////
-    function enableTokenTrade(ERC20 token) public onlyAdmin {
-        conversionRates.enableTokenTrade(token);
-    }
-
-    // set conversion rates reserve address
-    //////////////////////
-    function setReserveAddress(address reserve) public onlyAdmin {
-        conversionRates.setReserveAddress(reserve);
-    }
-
-    //set token control info
-    ////////////////////////
-    function setTokenControlData(ERC20[] tokens, uint[] maxPerBlockImbalanceValues, uint[] maxTotalImbalanceValues)
-        public
-        onlyAdmin
-    {
-        require(maxPerBlockImbalanceValues.length == tokens.length);
-        require(maxTotalImbalanceValues.length == tokens.length);
-
-        uint minRecordResolution;
-
-        for (uint i = 0; i < tokens.length; i++) {
-            uint maxPerBlock;
-            uint maxTotal;
-            (minRecordResolution, maxPerBlock, maxTotal) =
-            conversionRates.getTokenControlInfo(tokens[i]);
-            require(minRecordResolution != 0);
-
-            conversionRates.setTokenControlInfo(tokens[i],
-                minRecordResolution,
-                 maxPerBlockImbalanceValues[i],
-                maxTotalImbalanceValues[i]);
-        }
-    }
-
-    //set token min resolution
-    ////////////////////////
-    function setTokenMinResolution(ERC20[] tokens, uint[] minResolution) public onlyAdmin {
-        require(minResolution.length == tokens.length);
-
-        uint minRecordResolution;
-        uint maxPerBlock;
-        uint maxTotal;
-
-        for (uint i = 0; i < tokens.length; i++) {
-            (minRecordResolution, maxPerBlock, maxTotal) = conversionRates.getTokenControlInfo(tokens[i]);
-
-            conversionRates.setTokenControlInfo(tokens[i],
-                minResolution[i],
-                maxPerBlock,
-                maxTotal);
-        }
-    }
-
-    //valid duration blocks
-    ///////////////////////
-    function setValidDurationData(uint validDurationBlocks) public onlyAdmin {
-        require(validDurationBlocks > 5);
-        conversionRates.setValidRateDurationInBlocks(validDurationBlocks);
-    }
 }