diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-07-07 00:51:23 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-07-07 01:58:28 +0800 |
commit | d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd (patch) | |
tree | 978dd0a5132eee644d2163a33e25a24fdd4a3f14 /packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | |
parent | e796734659ddea76622d81b4416e0b36d5e7c0ed (diff) | |
download | dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar.gz dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar.bz2 dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar.lz dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar.xz dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.tar.zst dexon-0x-contracts-d2e422cd5eab26108e6c7a9f73c944f4b6fb4fdd.zip |
Apply new linter rules
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index 9e63dc1c0..cf53c3176 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.24; +pragma solidity 0.4.24; pragma experimental ABIEncoderV2; import "./libs/LibConstants.sol"; @@ -49,8 +49,6 @@ contract MixinExchangeCore is // Orders with specified senderAddress and with a salt less than their epoch to are considered cancelled mapping (address => mapping (address => uint256)) public orderEpoch; - ////// Core exchange functions ////// - /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch /// and senderAddress equal to msg.sender (or null address if msg.sender == makerAddress). /// @param targetOrderEpoch Orders created with a salt less or equal to this value will be cancelled. @@ -175,6 +173,7 @@ contract MixinExchangeCore is } // Validate order expiration + // solhint-disable-next-line not-rely-on-time if (block.timestamp >= order.expirationTimeSeconds) { orderInfo.orderStatus = uint8(OrderStatus.EXPIRED); return orderInfo; |