Replace Fixidity with DecimalMath in Issuance*.sol

HQ20 · Feb 28, 2020 · fd5b475 · fd5b475
1 parent e5b1d3f
commit fd5b475
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 41 deletions.
diff --git a/contracts/drafts/issuance/IssuanceAdvanced.sol b/contracts/drafts/issuance/IssuanceAdvanced.sol
@@ -9,6 +9,7 @@ import "../../token/IERC20Detailed.sol";
 import "../../token/IERC20MintableDetailed.sol";
 import "./../../state/StateMachine.sol";
 import "../../utils/SafeCast.sol";
+import "../../math/DecimalMath.sol";
 
 
 /**
@@ -18,9 +19,7 @@ import "../../utils/SafeCast.sol";
 contract IssuanceAdvanced is Ownable, StateMachine, ReentrancyGuard {
 
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
 
@@ -102,23 +101,12 @@ contract IssuanceAdvanced is Ownable, StateMachine, ReentrancyGuard {
         require(investments[msg.sender] > 0, "No investments found.");
         uint256 amount = investments[msg.sender];
         investments[msg.sender] = 0;
-        IERC20Detailed _currencyToken = IERC20Detailed(currencyToken);
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/issuance/Issuance.sol b/contracts/issuance/Issuance.sol
@@ -9,6 +9,7 @@ import "../token/IERC20Detailed.sol";
 import "../token/IERC20MintableDetailed.sol";
 import "../state/StateMachine.sol";
 import "../utils/SafeCast.sol";
+import "../math/DecimalMath.sol";
 
 
 /**
@@ -29,9 +30,7 @@ import "../utils/SafeCast.sol";
  */
 contract Issuance is Ownable, StateMachine, ReentrancyGuard {
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
     event IssuePriceSet();
@@ -98,23 +97,12 @@ contract Issuance is Ownable, StateMachine, ReentrancyGuard {
         );
         uint256 amount = investments[msg.sender];
         investments[msg.sender] = 0;
-        IERC20Detailed _currencyToken = IERC20Detailed(currencyToken);
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/issuance/IssuanceEth.sol b/contracts/issuance/IssuanceEth.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "../token/IERC20MintableDetailed.sol";
 import "../state/StateMachine.sol";
-import "../utils/SafeCast.sol";
+import "../math/DecimalMath.sol";
 
 
 /**
@@ -27,9 +27,7 @@ import "../utils/SafeCast.sol";
  */
 contract IssuanceEth is Ownable, StateMachine, ReentrancyGuard {
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
     event IssuePriceSet();
@@ -73,15 +71,9 @@ contract IssuanceEth is Ownable, StateMachine, ReentrancyGuard {
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(18);
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(18);
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/test/math/DecimalMathMock.sol b/contracts/test/math/DecimalMathMock.sol
@@ -21,6 +21,7 @@ contract DecimalMathMock {
     function muld(uint256 x, uint256 y) public pure returns (uint256) {
         return x.muld(y);
     }
+
     function muld2(
         uint256 x,
         uint256 y,