From 061facdcceddbc68620ae710c1f2fb2c99e4d3f3 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 14 May 2018 14:19:53 -0700 Subject: Removed redundant status checks in matchOrders. Saves gas, plus follows pattern of fillOrder more closely. --- .../src/contracts/current/protocol/Exchange/MixinMatchOrders.sol | 8 -------- 1 file changed, 8 deletions(-) (limited to 'packages/contracts/src') diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol index b20bc14ad..9ea44beab 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol @@ -63,10 +63,6 @@ contract MixinMatchOrders is leftOrderInfo.orderHash, leftOrderInfo.orderFilledAmount ) = getOrderInfo(leftOrder); - if (leftOrderInfo.orderStatus != uint8(Status.ORDER_FILLABLE)) { - emit ExchangeStatus(uint8(leftOrderInfo.orderStatus), leftOrderInfo.orderHash); - return matchedFillResults; - } // Get right status OrderInfo memory rightOrderInfo; @@ -74,10 +70,6 @@ contract MixinMatchOrders is rightOrderInfo.orderHash, rightOrderInfo.orderFilledAmount ) = getOrderInfo(rightOrder); - if (rightOrderInfo.orderStatus != uint8(Status.ORDER_FILLABLE)) { - emit ExchangeStatus(uint8(rightOrderInfo.orderStatus), rightOrderInfo.orderHash); - return matchedFillResults; - } // Fetch taker address address takerAddress = getCurrentContextAddress(); -- cgit v1.2.3