Merge pull request #21 from ripio/refactor

refactor
rcnfinance · Aug 13, 2019 · 31f743d · 31f743d
2 parents c266471 + 8af9658
commit 31f743d
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/contracts/ConverterRamp.sol b/contracts/ConverterRamp.sol
@@ -52,7 +52,7 @@ contract ConverterRamp is Ownable {
         );
 
         /// converter using token converter
-        convertSafe(_converter, _loanManagerAddress, _fromToken, address(token), amount);
+        convertSafe(_converter, _fromToken, address(token), amount);
 
         /// pay loan
         DebtEngine debtEngine = DebtEngine(_debtEngineAddress);
@@ -99,7 +99,10 @@ contract ConverterRamp is Ownable {
         );
 
         /// convert using token converter
-        convertSafe(_converter, _loanManagerAddress, _fromToken, address(token), amount);
+        (uint256 tokenCost) = convertSafe(_converter, _fromToken, address(token), amount);
+
+        /// approve token to loan manager
+        require(token.safeApprove(_loanManagerAddress, tokenCost), "Error approving lend token transfer");
 
         uint256 prevTokenBalance = token.balanceOf(address(this));
 
@@ -139,24 +142,25 @@ contract ConverterRamp is Ownable {
     /// @dev orchestrator between token->token, eth->token
     function convertSafe(
         address _converter,
-        address _loanManagerAddress,
         address _fromToken,
         address _token,
         uint256 _amount
-    ) internal {
+    ) internal returns (uint256) {
+
         (uint256 tokenCost, uint256 etherCost) = getCost(_amount, _converter, _fromToken, address(_token));
         if (_fromToken == ETH_ADDRESS) {
             ethConvertSafe(_converter, _fromToken, address(_token), _amount, tokenCost, etherCost);
+            return etherCost;
         } else {
-            tokenConvertSafe(_converter, _loanManagerAddress, _fromToken, address(_token), _amount, tokenCost, etherCost);
+            tokenConvertSafe(_converter, _fromToken, address(_token), _amount, tokenCost, etherCost);
+            return tokenCost;
         }
     }
 
     /// @dev not trusting the converter, validates all convertions using the token contract.
     ///      Token convertions
     function tokenConvertSafe(
         address _converter,
-        address _loanManagerAddress,
         address _fromTokenAddress,
         address _toTokenAddress,
         uint256 _amount,
@@ -186,9 +190,6 @@ contract ConverterRamp is Ownable {
         /// if we are converting from a token, remove the approve
         require(fromToken.safeApprove(address(tokenConverter), 0), "Error removing token approve");
 
-        /// approve token to loan manager
-        require(toToken.safeApprove(_loanManagerAddress, _tokenCost), "Error approving lend token transfer");
-
     }
 
     /// @dev not trusting the converter, validates all convertions using the token contract.