diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 07:16:44 +0800 |
|---|---|---|
| committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 07:16:44 +0800 |
| commit | 80291caf7cef16f0b300484755960d92d6750a6a (patch) | |
| tree | da0f38b1b3cbc9958554ff7e0cb88329480ba91a /packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | |
| parent | f6080367fe3a90762afea76a653c5df1315c45fa (diff) | |
| download | dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar.gz dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar.bz2 dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar.lz dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar.xz dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.tar.zst dexon-0x-contracts-80291caf7cef16f0b300484755960d92d6750a6a.zip | |
Append -Floor to getPartialAmount and isRoundingError
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index ab5c6e507..f3a0591b2 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -320,7 +320,7 @@ contract MixinExchangeCore is // Validate fill order rounding require( - !isRoundingError( + !isRoundingErrorFloor( takerAssetFilledAmount, order.takerAssetAmount, order.makerAssetAmount @@ -376,17 +376,17 @@ contract MixinExchangeCore is { // Compute proportional transfer amounts fillResults.takerAssetFilledAmount = takerAssetFilledAmount; - fillResults.makerAssetFilledAmount = getPartialAmount( + fillResults.makerAssetFilledAmount = getPartialAmountFloor( takerAssetFilledAmount, order.takerAssetAmount, order.makerAssetAmount ); - fillResults.makerFeePaid = getPartialAmount( + fillResults.makerFeePaid = getPartialAmountFloor( takerAssetFilledAmount, order.takerAssetAmount, order.makerFee ); - fillResults.takerFeePaid = getPartialAmount( + fillResults.takerFeePaid = getPartialAmountFloor( takerAssetFilledAmount, order.takerAssetAmount, order.takerFee |