fix more tests

MARKETProtocol · Sep 28, 2018 · aec2d53 · aec2d53
1 parent f4ee832
commit aec2d53
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 73 deletions.
diff --git a/contracts/MarketTradingHub.sol b/contracts/MarketTradingHub.sol
@@ -107,16 +107,17 @@ contract MarketTradingHub {
     ) external returns (int filledQty)
     {
         MarketContract marketContract = MarketContract(orderAddresses[0]);
-        require(!marketContract.isSettled()); // no trading past settlement
-        require(orderQty != 0 && qtyToFill != 0 && orderQty.isSameSign(qtyToFill));   // no zero trades, sings match
-        require(MKT_TOKEN.isUserEnabledForContract(this, msg.sender));
+        require(!marketContract.isSettled(), "Contract has already settled"); // no trading past settlement
+        require(orderQty != 0 && qtyToFill != 0 && orderQty.isSameSign(qtyToFill), "qty Error");   // no zero trades, sings match
+        require(MKT_TOKEN.isUserEnabledForContract(this, msg.sender), "taker not enabled");
         OrderLib.Order memory order = OrderLib.createOrder(orderAddresses, unsignedOrderValues, orderQty);
-        require(MKT_TOKEN.isUserEnabledForContract(this, order.maker));
+        require(MKT_TOKEN.isUserEnabledForContract(this, order.maker), "maker not enabled");
 
         // taker can be anyone, or specifically the caller!
-        require(order.taker == address(0) || order.taker == msg.sender);
+        require(order.taker == address(0) || order.taker == msg.sender, "invalid taker");
         // do not allow self trade
-        require(order.maker != address(0) && order.maker != msg.sender);
+        require(order.maker != address(0) && order.maker != msg.sender, "invalid wash trade");
+
         require(
             OrderLib.isValidSignature(
                 order.maker,