Add validation for the case where the order is fully filled or canceled and a test

1 files changed, 5 insertions, 0 deletions

diff --git a/src/utils/order_validation_utils.ts b/src/utils/order_validation_utils.ts
index 6f9cd7b1a..445ad43f9 100644
--- a/src/utils/order_validation_utils.ts
+++ b/src/utils/order_validation_utils.ts
@@ -16,6 +16,11 @@ export class OrderValidationUtils {
                                                       takerAddress: string,
                                                       zrxTokenAddress: string): Promise<void> {
         if (fillTakerTokenAmount.eq(0)) {
+            throw new Error(ExchangeContractErrs.OrderFillAmountZero);
+        }
+        const orderHash = utils.getOrderHashHex(signedOrder);
+        const unavailableTakerTokenAmount = await this.exchangeWrapper.getUnavailableTakerAmountAsync(orderHash);
+        if (signedOrder.makerTokenAmount.eq(unavailableTakerTokenAmount)) {
             throw new Error(ExchangeContractErrs.OrderRemainingFillAmountZero);
         }
         if (signedOrder.taker !== constants.NULL_ADDRESS && signedOrder.taker !== takerAddress) {