Rephrased some of the math in MixinMatchOrders to improve readability

This commit is contained in:
Greg Hysen 2018-08-24 18:09:32 -07:00
parent 287830d6e0
commit ec2e726be0

View File

@ -184,12 +184,12 @@ contract MixinMatchOrders is
// Case 1: Right order is fully filled
matchedFillResults.right.makerAssetFilledAmount = rightMakerAssetAmountRemaining;
matchedFillResults.right.takerAssetFilledAmount = rightTakerAssetAmountRemaining;
matchedFillResults.left.takerAssetFilledAmount = matchedFillResults.right.makerAssetFilledAmount;
matchedFillResults.left.makerAssetFilledAmount = getPartialAmountFloor(
leftOrder.makerAssetAmount,
leftOrder.takerAssetAmount,
matchedFillResults.right.makerAssetFilledAmount
matchedFillResults.left.takerAssetFilledAmount
);
matchedFillResults.left.takerAssetFilledAmount = matchedFillResults.right.makerAssetFilledAmount;
} else {
// Case 2: Left order is fully filled
matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
@ -198,7 +198,7 @@ contract MixinMatchOrders is
matchedFillResults.right.takerAssetFilledAmount = getPartialAmountCeil(
rightOrder.takerAssetAmount,
rightOrder.makerAssetAmount,
matchedFillResults.left.takerAssetFilledAmount
matchedFillResults.right.makerAssetFilledAmount
);
}