Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16

3 files changed, 4 insertions, 4 deletions

diff --git a/packages/order-utils/src/market_utils.ts b/packages/order-utils/src/market_utils.ts
index 441c50e5c..4a664cb14 100644
--- a/packages/order-utils/src/market_utils.ts
+++ b/packages/order-utils/src/market_utils.ts
@@ -128,7 +128,7 @@ export const marketUtils = {
                 const makerAssetAmountAvailable = remainingFillableMakerAssetAmounts[index];
                 const feeToFillMakerAssetAmountAvailable = makerAssetAmountAvailable
                     .mul(order.takerFee)
-                    .div(order.makerAssetAmount);
+                    .dividedToIntegerBy(order.makerAssetAmount);
                 return accFees.plus(feeToFillMakerAssetAmountAvailable);
             },
             constants.ZERO_AMOUNT,
@@ -142,7 +142,7 @@ export const marketUtils = {
             },
         );
         return {
-            resultOrders,
+            resultFeeOrders: resultOrders,
             remainingFeeAmount: remainingFillAmount,
         };
         // TODO: add more orders here to cover rounding
diff --git a/packages/order-utils/src/sorting_utils.ts b/packages/order-utils/src/sorting_utils.ts
index 8811bcaf8..cd5163cf6 100644
--- a/packages/order-utils/src/sorting_utils.ts
+++ b/packages/order-utils/src/sorting_utils.ts
@@ -32,7 +32,7 @@ export const sortingUtils = {
      *                          the makerAsset and WETH as the takerAsset.
      * @return  The input orders sorted by rate in ascending order
      */
-    sortFeeOrdersByFeeAdjustedRate(feeOrders: Order[]): Order[] {
+    sortFeeOrdersByFeeAdjustedRate<T extends Order>(feeOrders: T[]): T[] {
         assert.doesConformToSchema('feeOrders', feeOrders, schemas.ordersSchema);
         const rateCalculator = rateUtils.getFeeAdjustedRateOfFeeOrder.bind(rateUtils);
         const sortedOrders = sortOrders(feeOrders, rateCalculator);
diff --git a/packages/order-utils/src/types.ts b/packages/order-utils/src/types.ts
index 4088805dc..09292e557 100644
--- a/packages/order-utils/src/types.ts
+++ b/packages/order-utils/src/types.ts
@@ -71,7 +71,7 @@ export interface FindFeeOrdersThatCoverFeesForTargetOrdersOpts {
 }
 
 export interface FeeOrdersAndRemainingFeeAmount<T> {
-    resultOrders: T[];
+    resultFeeOrders: T[];
     remainingFeeAmount: BigNumber;
 }