aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-08-24 07:07:39 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-08-25 09:20:25 +0800
commit81dc893d1d07e5a8485fb40aa247428cda79d788 (patch)
tree2833d80eb6452eb65d200f4c291c2e6e04536f51 /packages/contracts
parentf8e565bc06b48f4e59b9a246fdf1e4b16245bd83 (diff)
downloaddexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar.gz
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar.bz2
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar.lz
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar.xz
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.tar.zst
dexon-sol-tools-81dc893d1d07e5a8485fb40aa247428cda79d788.zip
Removed a redundant comment from matchOrders
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol6
1 files changed, 1 insertions, 5 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
index b3f376eb8..d932c743f 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
@@ -165,11 +165,6 @@ contract MixinMatchOrders is
pure
returns (LibFillResults.MatchedFillResults memory matchedFillResults)
{
- // We settle orders at the exchange rate of the right order.
- // The amount saved by the left maker goes to the taker.
- // Either the left or right order will be fully filled; possibly both.
- // The left order is fully filled iff the right order can sell more than left can buy.
-
// Derive maker asset amounts for left & right orders, given store taker assert amounts
uint256 leftTakerAssetAmountRemaining = safeSub(leftOrder.takerAssetAmount, leftOrderTakerAssetFilledAmount);
uint256 leftMakerAssetAmountRemaining = getPartialAmountFloor(
@@ -184,6 +179,7 @@ contract MixinMatchOrders is
rightTakerAssetAmountRemaining
);
+ // Calculate fill results for maker and taker assets
if (leftTakerAssetAmountRemaining >= rightMakerAssetAmountRemaining) {
// Case 1: Right order is fully filled: maximally fill right
matchedFillResults.right.makerAssetFilledAmount = rightMakerAssetAmountRemaining;