1 files changed, 32 insertions, 25 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
index be163ec97..736dcd0b1 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
@@ -75,7 +75,11 @@ contract MixinExchangeCore is
 
         // Update orderEpoch
         orderEpoch[makerAddress][senderAddress] = newOrderEpoch;
-        emit CancelUpTo(makerAddress, senderAddress, newOrderEpoch);
+        emit CancelUpTo(
+            makerAddress,
+            senderAddress,
+            newOrderEpoch
+        );
     }
 
     /// @dev Fills the input order.
@@ -107,14 +111,7 @@ contract MixinExchangeCore is
         public
         nonReentrant
     {
-        // Fetch current order status
-        OrderInfo memory orderInfo = getOrderInfo(order);
-
-        // Validate context
-        assertValidCancel(order, orderInfo);
-
-        // Perform cancel
-        updateCancelledState(order, orderInfo.orderHash);
+        cancelOrderInternal(order);
     }
 
     /// @dev Gets information about an order: status, hash, and amount filled.
@@ -231,11 +228,31 @@ contract MixinExchangeCore is
         );
     
         // Settle order
-        settleOrder(order, takerAddress, fillResults);
+        settleOrder(
+            order,
+            takerAddress,
+            fillResults
+        );
 
         return fillResults;
     }
 
+    /// @dev After calling, the order can not be filled anymore.
+    ///      Throws if order is invalid or sender does not have permission to cancel.
+    /// @param order Order to cancel. Order must be OrderStatus.FILLABLE.
+    function cancelOrderInternal(Order memory order)
+        internal
+    {
+        // Fetch current order status
+        OrderInfo memory orderInfo = getOrderInfo(order);
+
+        // Validate context
+        assertValidCancel(order, orderInfo);
+
+        // Perform cancel
+        updateCancelledState(order, orderInfo.orderHash);
+    }
+
     /// @dev Updates state with results of a fill order.
     /// @param order that was filled.
     /// @param takerAddress Address of taker who filled the order.
@@ -404,16 +421,6 @@ contract MixinExchangeCore is
             safeMul(order.makerAssetAmount, takerAssetFilledAmount),
             "INVALID_FILL_PRICE"
         );
-        
-        // Validate fill order rounding
-        require(
-            !isRoundingErrorFloor(
-                takerAssetFilledAmount,
-                order.takerAssetAmount,
-                order.makerAssetAmount
-            ),
-            "ROUNDING_ERROR"
-        );
     }
 
     /// @dev Validates context for cancelOrder. Succeeds or throws.
@@ -463,17 +470,17 @@ contract MixinExchangeCore is
     {
         // Compute proportional transfer amounts
         fillResults.takerAssetFilledAmount = takerAssetFilledAmount;
-        fillResults.makerAssetFilledAmount = getPartialAmountFloor(
+        fillResults.makerAssetFilledAmount = safeGetPartialAmountFloor(
             takerAssetFilledAmount,
             order.takerAssetAmount,
             order.makerAssetAmount
         );
-        fillResults.makerFeePaid = getPartialAmountFloor(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
+        fillResults.makerFeePaid = safeGetPartialAmountFloor(
+            fillResults.makerAssetFilledAmount,
+            order.makerAssetAmount,
             order.makerFee
         );
-        fillResults.takerFeePaid = getPartialAmountFloor(
+        fillResults.takerFeePaid = safeGetPartialAmountFloor(
             takerAssetFilledAmount,
             order.takerAssetAmount,
             order.takerFee