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

Wording in MixinMatchOrders

Browse Source
This commit is contained in:
Greg Hysen 2018-08-23 16:16:01 -07:00
parent 6833e243b7
commit a93f95c55e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ contract MixinMatchOrders is
// Calculate fill results for maker and taker assets // Calculate fill results for maker and taker assets
if (leftTakerAssetAmountRemaining >= rightMakerAssetAmountRemaining) { if (leftTakerAssetAmountRemaining >= rightMakerAssetAmountRemaining) {
// Case 1: Right order is fully filled: maximally fill right // 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.makerAssetFilledAmount = getPartialAmountFloor( matchedFillResults.left.makerAssetFilledAmount = getPartialAmountFloor(
@ -191,7 +191,7 @@ contract MixinMatchOrders is
); );
matchedFillResults.left.takerAssetFilledAmount = matchedFillResults.right.makerAssetFilledAmount; matchedFillResults.left.takerAssetFilledAmount = matchedFillResults.right.makerAssetFilledAmount;
} else { } else {
// Case 2: Left order is fully filled: maximall fill left // Case 2: Left order is fully filled
matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining; matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining; matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining;
matchedFillResults.right.makerAssetFilledAmount = matchedFillResults.left.takerAssetFilledAmount; matchedFillResults.right.makerAssetFilledAmount = matchedFillResults.left.takerAssetFilledAmount;