Update test contracts

This commit is contained in:
Amir Bandeali
2019-07-29 21:56:13 -05:00
parent f45014f75b
commit 7eb64eb3dc
2 changed files with 138 additions and 28 deletions

View File

@@ -0,0 +1,130 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "../src/LibMath.sol";
contract TestLibMath {
/// @dev Calculates partial value given a numerator and denominator.
/// Reverts if rounding error is >= 0.1%
/// @param numerator Numerator.
/// @param denominator Denominator.
/// @param target Value to calculate partial of.
/// @return Partial value of target.
function safeGetPartialAmountFloor(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (uint256 partialAmount)
{
return LibMath.safeGetPartialAmountFloor(numerator, denominator, target);
}
/// @dev Calculates partial value given a numerator and denominator.
/// Reverts if rounding error is >= 0.1%
/// @param numerator Numerator.
/// @param denominator Denominator.
/// @param target Value to calculate partial of.
/// @return Partial value of target.
function safeGetPartialAmountCeil(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (uint256 partialAmount)
{
return LibMath.safeGetPartialAmountCeil(numerator, denominator, target);
}
/// @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 getPartialAmountFloor(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (uint256 partialAmount)
{
return LibMath.getPartialAmountFloor(numerator, denominator, target);
}
/// @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 getPartialAmountCeil(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (uint256 partialAmount)
{
return LibMath.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 isRoundingErrorFloor(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (bool isError)
{
return LibMath.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 isRoundingErrorCeil(
uint256 numerator,
uint256 denominator,
uint256 target
)
public
pure
returns (bool isError)
{
return LibMath.isRoundingErrorCeil(numerator, denominator, target);
}
}

View File

@@ -28,11 +28,7 @@ import "../src/LibFillResults.sol";
// solhint-disable no-empty-blocks
contract TestLibs is
LibEIP712ExchangeDomain,
LibMath,
LibOrder,
LibZeroExTransaction,
LibFillResults
LibEIP712ExchangeDomain
{
constructor (uint256 chainId)
public
@@ -48,7 +44,7 @@ contract TestLibs is
pure
returns (uint256 partialAmount)
{
partialAmount = _getPartialAmountFloor(
partialAmount = LibMath.getPartialAmountFloor(
numerator,
denominator,
target
@@ -65,7 +61,7 @@ contract TestLibs is
pure
returns (uint256 partialAmount)
{
partialAmount = _getPartialAmountCeil(
partialAmount = LibMath.getPartialAmountCeil(
numerator,
denominator,
target
@@ -116,7 +112,7 @@ contract TestLibs is
pure
returns (bool isError)
{
isError = _isRoundingErrorFloor(
isError = LibMath.isRoundingErrorFloor(
numerator,
denominator,
target
@@ -133,7 +129,7 @@ contract TestLibs is
pure
returns (bool isError)
{
isError = _isRoundingErrorCeil(
isError = LibMath.isRoundingErrorCeil(
numerator,
denominator,
target
@@ -141,22 +137,6 @@ contract TestLibs is
return isError;
}
function getOrderSchemaHash()
public
pure
returns (bytes32)
{
return EIP712_ORDER_SCHEMA_HASH;
}
function getDomainSeparatorSchemaHash()
public
pure
returns (bytes32)
{
return EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH;
}
function getDomainSeparator()
public
view
@@ -165,12 +145,12 @@ contract TestLibs is
return EIP712_EXCHANGE_DOMAIN_HASH;
}
function addFillResults(FillResults memory totalFillResults, FillResults memory singleFillResults)
function addFillResults(LibFillResults.FillResults memory totalFillResults, LibFillResults.FillResults memory singleFillResults)
public
pure
returns (FillResults memory)
returns (LibFillResults.FillResults memory)
{
_addFillResults(totalFillResults, singleFillResults);
LibFillResults.addFillResults(totalFillResults, singleFillResults);
return totalFillResults;
}
}