aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/extensions
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-12-19 03:53:41 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-12-19 05:36:05 +0800
commitca0ab385218d588aee10502e3d75ade30ad0b5d7 (patch)
treee8570a380ca74a03261961ce790f103a9cec28aa /contracts/extensions
parentd2a4fd570622de34a3d8e8a25735b025e3ac5f77 (diff)
downloaddexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar.gz
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar.bz2
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar.lz
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar.xz
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.tar.zst
dexon-sol-tools-ca0ab385218d588aee10502e3d75ade30ad0b5d7.zip
Fixed solhint errors
Diffstat (limited to 'contracts/extensions')
-rw-r--r--contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol28
1 files changed, 14 insertions, 14 deletions
diff --git a/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol b/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
index ab6989115..df830f36e 100644
--- a/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
+++ b/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
@@ -98,34 +98,34 @@ contract MixinBalanceThresholdFilterCore is
bytes4 exchangeFunctionSelector = bytes4(exchangeCalldataload(0));
// solhint-disable expression-indent
if (
- exchangeFunctionSelector == batchFillOrdersSelector ||
- exchangeFunctionSelector == batchFillOrdersNoThrowSelector ||
- exchangeFunctionSelector == batchFillOrKillOrdersSelector ||
- exchangeFunctionSelector == marketBuyOrdersSelector ||
- exchangeFunctionSelector == marketBuyOrdersNoThrowSelector ||
- exchangeFunctionSelector == marketSellOrdersSelector ||
- exchangeFunctionSelector == marketSellOrdersNoThrowSelector
+ exchangeFunctionSelector == BATCH_FILL_ORDERS_SELECTOR ||
+ exchangeFunctionSelector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR ||
+ exchangeFunctionSelector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR ||
+ exchangeFunctionSelector == MARKET_BUY_ORDERS_SELECTOR ||
+ exchangeFunctionSelector == MARKET_BUY_ORDERS_NO_THROW_SELECTOR ||
+ exchangeFunctionSelector == MARKET_SELL_ORDERS_SELECTOR ||
+ exchangeFunctionSelector == MARKET_SELL_ORDERS_NO_THROW_SELECTOR
) {
addressesToValidate = loadMakerAddressesFromOrderArray(0);
addressesToValidate = addressesToValidate.append(signerAddress);
} else if (
- exchangeFunctionSelector == fillOrderSelector ||
- exchangeFunctionSelector == fillOrderNoThrowSelector ||
- exchangeFunctionSelector == fillOrKillOrderSelector
+ exchangeFunctionSelector == FILL_ORDER_SELECTOR ||
+ exchangeFunctionSelector == FILL_ORDER_NO_THROW_SELECTOR ||
+ exchangeFunctionSelector == FILL_OR_KILL_ORDER_SELECTOR
) {
address makerAddress = loadMakerAddressFromOrder(0);
addressesToValidate = addressesToValidate.append(makerAddress);
addressesToValidate = addressesToValidate.append(signerAddress);
- } else if (exchangeFunctionSelector == matchOrdersSelector) {
+ } else if (exchangeFunctionSelector == MATCH_ORDERS_SELECTOR) {
address leftMakerAddress = loadMakerAddressFromOrder(0);
addressesToValidate = addressesToValidate.append(leftMakerAddress);
address rightMakerAddress = loadMakerAddressFromOrder(1);
addressesToValidate = addressesToValidate.append(rightMakerAddress);
addressesToValidate = addressesToValidate.append(signerAddress);
} else if (
- exchangeFunctionSelector != cancelOrderSelector &&
- exchangeFunctionSelector != batchCancelOrdersSelector &&
- exchangeFunctionSelector != cancelOrdersUpToSelector
+ exchangeFunctionSelector != CANCEL_ORDER_SELECTOR &&
+ exchangeFunctionSelector != BATCH_CANCEL_ORDERS_SELECTOR &&
+ exchangeFunctionSelector != CANCEL_ORDERS_UP_TO_SELECTOR
) {
revert("INVALID_OR_BLOCKED_EXCHANGE_SELECTOR");
}