From ba383a6d204bba3e910d011e29b7ab4c5bb4fadf Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Sun, 2 Jul 2017 13:01:55 -0300 Subject: [PATCH] refactor max and min out of SafeMath --- contracts/math/Math.sol | 24 ++++++++++++++++++++++++ contracts/math/SafeMath.sol | 17 ----------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 contracts/math/Math.sol diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol new file mode 100644 index 000000000..fa89c371f --- /dev/null +++ b/contracts/math/Math.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.4.11; + +/** + * @title Math + * @dev Assorted math operations + */ + +contract Math { + function max64(uint64 a, uint64 b) internal constant returns (uint64) { + return a >= b ? a : b; + } + + function min64(uint64 a, uint64 b) internal constant returns (uint64) { + return a < b ? a : b; + } + + function max256(uint256 a, uint256 b) internal constant returns (uint256) { + return a >= b ? a : b; + } + + function min256(uint256 a, uint256 b) internal constant returns (uint256) { + return a < b ? a : b; + } +} diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol index 4f6861c20..dc05ba280 100644 --- a/contracts/math/SafeMath.sol +++ b/contracts/math/SafeMath.sol @@ -29,21 +29,4 @@ library SafeMath { assert(c >= a); return c; } - - function max64(uint64 a, uint64 b) internal constant returns (uint64) { - return a >= b ? a : b; - } - - function min64(uint64 a, uint64 b) internal constant returns (uint64) { - return a < b ? a : b; - } - - function max256(uint256 a, uint256 b) internal constant returns (uint256) { - return a >= b ? a : b; - } - - function min256(uint256 a, uint256 b) internal constant returns (uint256) { - return a < b ? a : b; - } - }