diff options
author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
---|---|---|
committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
commit | d652deea232417bbef223bde46d8c12e9922b277 (patch) | |
tree | f40e28c1231fa6646aae3354f3e58d98fa000e14 /packages/contracts/src/2.0.0/test/TestExchangeInternals | |
parent | 6b866d60533c7e46446bfb69639b07affd1aeb17 (diff) | |
parent | f938c989e3e07161de20dd865baf59eecdde872d (diff) | |
download | dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.gz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.bz2 dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.lz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.xz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.zst dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.zip |
Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js into fix/contracts/robustMatching
Diffstat (limited to 'packages/contracts/src/2.0.0/test/TestExchangeInternals')
-rw-r--r-- | packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol b/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol index d9cec9edc..da9313e02 100644 --- a/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol +++ b/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol @@ -67,7 +67,7 @@ contract TestExchangeInternals is /// @param denominator Denominator. /// @param target Value to calculate partial of. /// @return Partial value of target. - function publicGetPartialAmount( + function publicGetPartialAmountFloor( uint256 numerator, uint256 denominator, uint256 target @@ -76,15 +76,49 @@ contract TestExchangeInternals is pure returns (uint256 partialAmount) { - return getPartialAmount(numerator, denominator, target); + return getPartialAmountFloor(numerator, denominator, target); } - /// @dev Checks if rounding error > 0.1%. + /// @dev Calculates partial value given a numerator and denominator. + /// @param numerator Numerator. + /// @param denominator Denominator. + /// @param target Value to calculate partial of. + /// @return Partial value of target. + function publicGetPartialAmountCeil( + uint256 numerator, + uint256 denominator, + uint256 target + ) + public + pure + returns (uint256 partialAmount) + { + return getPartialAmountCeil(numerator, denominator, target); + } + + /// @dev Checks if rounding error >= 0.1%. + /// @param numerator Numerator. + /// @param denominator Denominator. + /// @param target Value to multiply with numerator/denominator. + /// @return Rounding error is present. + function publicIsRoundingErrorFloor( + uint256 numerator, + uint256 denominator, + uint256 target + ) + public + pure + returns (bool isError) + { + return isRoundingErrorFloor(numerator, denominator, target); + } + + /// @dev Checks if rounding error >= 0.1%. /// @param numerator Numerator. /// @param denominator Denominator. /// @param target Value to multiply with numerator/denominator. /// @return Rounding error is present. - function publicIsRoundingError( + function publicIsRoundingErrorCeil( uint256 numerator, uint256 denominator, uint256 target @@ -93,7 +127,7 @@ contract TestExchangeInternals is pure returns (bool isError) { - return isRoundingError(numerator, denominator, target); + return isRoundingErrorCeil(numerator, denominator, target); } /// @dev Updates state with results of a fill order. |