Modified the matchOrders tests to test matchOrdersWithMaximalFill

0xProject · Jul 1, 2019 · 1e2d43c · 1e2d43c
1 parent 7a90b9d
commit 1e2d43c
Show file tree

Hide file tree

Showing 5 changed files with 395 additions and 16 deletions.
diff --git a/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol b/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol
@@ -185,7 +185,7 @@ contract MixinAssetProxyDispatcher is
                     // at `cdStart`.
                     // The first 32 bytes are the length of the data.
                     mstore(cdStart, revertDataSize)
-                    // Copy the revert data immediately after the length. 
+                    // Copy the revert data immediately after the length.
                     returndatacopy(add(cdStart, 32), 0, revertDataSize)
                     // We need to move the free memory pointer because we
                     // still have solidity logic that executes after this assembly.

diff --git a/contracts/exchange/contracts/src/MixinMatchOrders.sol b/contracts/exchange/contracts/src/MixinMatchOrders.sol
@@ -146,12 +146,13 @@ contract MixinMatchOrders is
         }
     }
 
+    // FIXME
     function _batchMatchOrders(
         LibOrder.Order[] memory leftOrders,
         LibOrder.Order[] memory rightOrders,
         bytes[] memory leftSignatures,
         bytes[] memory rightSignatures,
-        bool isWithMaximalFill
+        bool withMaximalFill
     )
         internal
         returns (LibFillResults.BatchMatchedFillResults memory batchMatchedFillResults)
@@ -184,7 +185,7 @@ contract MixinMatchOrders is
             LibFillResults.MatchedFillResults memory matchResults;
             // Match the two orders that are pointed to by the left and right indices. If specified, use the
             // matchOrdersWithMaximalFill function.
-            if (isWithMaximalFill) {
+            if (withMaximalFill) {
                 // Match the two orders that are pointed to by the left and right indices
                 matchResults = matchOrdersWithMaximalFill(
                     leftOrder,
@@ -297,14 +298,14 @@ contract MixinMatchOrders is
     /// @param leftOrderTakerAssetFilledAmount Amount of left order already filled.
     /// @param rightOrderTakerAssetFilledAmount Amount of right order already filled.
     /// @param matchedFillResults Amounts to fill and fees to pay by maker and taker of matched orders.
-    /// @param maximalFill A boolean indicating whether or not this calculation should use the maximal
+    /// @param withMaximalFill A boolean indicating whether or not this calculation should use the maximal
     ///                    fill strategy for order matching.
     function _calculateMatchedFillResults(
         LibOrder.Order memory leftOrder,
         LibOrder.Order memory rightOrder,
         uint256 leftOrderTakerAssetFilledAmount,
         uint256 rightOrderTakerAssetFilledAmount,
-        bool maximalFill
+        bool withMaximalFill
     )
         internal
         pure
@@ -324,7 +325,7 @@ contract MixinMatchOrders is
             rightTakerAssetAmountRemaining
         );
 
-        if (maximalFill) {
+        if (withMaximalFill) {
             bool leftSpread;
             bool rightSpread;
             // FIXME -- Add good comments
@@ -349,15 +350,15 @@ contract MixinMatchOrders is
                 );
                 matchedFillResults.right.takerAssetFilledAmount = leftMakerAssetAmountRemaining;
                 matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
-                matchedFillResults.left.makerAssetFilledAmount = leftTakerAssetAmountRemaining;
+                matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining;
                 // FIXME(Add comment?)
                 rightSpread = true;
             } else {
                 // Case 3: The right and left orders are fully filled
-                matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
-                matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining;
                 matchedFillResults.right.makerAssetFilledAmount = rightMakerAssetAmountRemaining;
                 matchedFillResults.right.takerAssetFilledAmount = rightTakerAssetAmountRemaining;
+                matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
+                matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining;
                 // FIXME(Add comment?)
                 leftSpread = true;
                 rightSpread = true;
@@ -659,6 +660,14 @@ contract MixinMatchOrders is
             matchedFillResults.leftMakerAssetSpreadAmount
         );
 
+        _dispatchTransferFrom(
+            rightOrderHash,
+            rightOrder.makerAssetData,
+            rightOrder.makerAddress,
+            takerAddress,
+            matchedFillResults.rightMakerAssetSpreadAmount
+        );
+
         // Settle taker fees.
         if (
             leftFeeRecipientAddress == rightFeeRecipientAddress &&