uint256 -> uint
use 256 in more places break out separate functions
This commit is contained in:
@ -1,14 +1,14 @@
|
||||
pragma solidity 0.5.12;
|
||||
|
||||
library Math {
|
||||
function min(uint256 x, uint256 y) internal pure returns (uint256 z) {
|
||||
function min(uint x, uint y) internal pure returns (uint z) {
|
||||
return x <= y ? x : y;
|
||||
}
|
||||
|
||||
function sqrt(uint256 x) internal pure returns (uint256 y) {
|
||||
function sqrt(uint x) internal pure returns (uint y) {
|
||||
if (x == 0) return 0;
|
||||
else if (x <= 3) return 1;
|
||||
uint256 z = (x + 1) / 2;
|
||||
uint z = (x + 1) / 2;
|
||||
y = x;
|
||||
while (z < y) {
|
||||
y = z;
|
||||
|
||||
27
contracts/libraries/SafeMath.sol
Normal file
27
contracts/libraries/SafeMath.sol
Normal file
@ -0,0 +1,27 @@
|
||||
pragma solidity 0.5.12;
|
||||
|
||||
library SafeMath {
|
||||
function add(uint x, uint y) internal pure returns (uint z) {
|
||||
require((z = x + y) >= x, "ds-math-add-overflow");
|
||||
}
|
||||
function sub(uint x, uint y) internal pure returns (uint z) {
|
||||
require((z = x - y) <= x, "ds-math-sub-underflow");
|
||||
}
|
||||
function mul(uint x, uint y) internal pure returns (uint z) {
|
||||
require(y == 0 || (z = x * y) / y == x, "ds-math-mul-overflow");
|
||||
}
|
||||
|
||||
function clamp128(uint y) internal pure returns (uint128 z) {
|
||||
z = y <= uint128(-1) ? uint128(y) : uint128(-1);
|
||||
}
|
||||
|
||||
function downcast128(uint y) internal pure returns (uint128 z) {
|
||||
require(y <= uint128(-1), "downcast-128-overflow");
|
||||
z = uint128(y);
|
||||
}
|
||||
|
||||
function downcast32(uint y) internal pure returns (uint32 z) {
|
||||
require(y <= uint32(-1), "downcast-32-overflow");
|
||||
z = uint32(y);
|
||||
}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
pragma solidity 0.5.12;
|
||||
|
||||
library SafeMath256 {
|
||||
function add(uint256 x, uint256 y) internal pure returns (uint256 z) {
|
||||
require((z = x + y) >= x, "ds-math-add-overflow");
|
||||
}
|
||||
function sub(uint256 x, uint256 y) internal pure returns (uint256 z) {
|
||||
require((z = x - y) <= x, "ds-math-sub-underflow");
|
||||
}
|
||||
function mul(uint256 x, uint256 y) internal pure returns (uint256 z) {
|
||||
require(y == 0 || (z = x * y) / y == x, "ds-math-mul-overflow");
|
||||
}
|
||||
|
||||
function downcast128(uint256 y) internal pure returns (uint128 z) {
|
||||
require(y <= uint128(-1), "downcast-128-overflow");
|
||||
z = uint128(y);
|
||||
}
|
||||
|
||||
function downcast32(uint256 y) internal pure returns (uint32 z) {
|
||||
require(y <= uint32(-1), "downcast-32-overflow");
|
||||
z = uint32(y);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user