crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rephrased some of the math in MixinMatchOrders to improve readability

Browse Source
This commit is contained in:
Greg Hysen 2018-08-24 18:09:32 -07:00
parent 287830d6e0
commit ec2e726be0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol vendored
View File

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