Fix calculation of expFilledTakerAmount and expected values in events emitted

1 files changed, 7 insertions, 4 deletions

diff --git a/packages/contracts/src/utils/core_combinatorial_utils.ts b/packages/contracts/src/utils/core_combinatorial_utils.ts
index dac4e9edd..4ce23d450 100644
--- a/packages/contracts/src/utils/core_combinatorial_utils.ts
+++ b/packages/contracts/src/utils/core_combinatorial_utils.ts
@@ -352,11 +352,14 @@ export class CoreCombinatorialUtils {
         const expZRXAssetBalanceOfFeeRecipient = await lazyStore.getBalanceAsync(this.zrxAssetData, feeRecipient);
 
         const orderHash = orderHashUtils.getOrderHashHex(signedOrder);
-        const initialFilledTakerAmount = await this.exchangeWrapper.getTakerAssetFilledAmountAsync(orderHash);
-        const expFilledTakerAmount = initialFilledTakerAmount.add(takerAssetFillAmount);
+        const alreadyFilledTakerAmount = await this.exchangeWrapper.getTakerAssetFilledAmountAsync(orderHash);
+        const remainingTakerAmountToFill = signedOrder.takerAssetAmount.minus(alreadyFilledTakerAmount);
+        const expFilledTakerAmount = takerAssetFillAmount.gt(remainingTakerAmountToFill)
+            ? remainingTakerAmountToFill
+            : alreadyFilledTakerAmount.add(takerAssetFillAmount);
 
         const expFilledMakerAmount = orderUtils.getPartialAmount(
-            takerAssetFillAmount,
+            expFilledTakerAmount,
             signedOrder.takerAssetAmount,
             signedOrder.makerAssetAmount,
         );
@@ -380,7 +383,7 @@ export class CoreCombinatorialUtils {
             'log.args.makerAssetFilledAmount',
         );
         expect(log.args.takerAssetFilledAmount).to.be.bignumber.equal(
-            takerAssetFillAmount,
+            expFilledTakerAmount,
             'log.args.takerAssetFilledAmount',
         );
         const expMakerFeePaid = orderUtils.getPartialAmount(