tests: fix most of the static warnings (#844)

contracts/AddressUtils.sol

@@ -1,20 +1,27 @@
 pragma solidity ^0.4.18;
 
+
 /**
  * Utility library of inline functions on addresses
  */
 library AddressUtils {
 
   /**
-   * Returns whether there is code in the target address
+   * Returns whether the target address is a contract
    * @dev This function will return false if invoked during the constructor of a contract,
    *  as the code is not actually created until after the constructor finishes.
-   * @param addr address address to check
-   * @return whether there is code in the target address
+   * @param addr address to check
+   * @return whether the target address is a contract
    */
   function isContract(address addr) internal view returns (bool) {
     uint256 size;
-    assembly { size := extcodesize(addr) }
+    // XXX Currently there is no better way to check if there is a contract in an address
+    // than to check the size of the code at that address.
+    // See https://ethereum.stackexchange.com/a/14016/36603
+    // for more details about how this works.
+    // TODO Check this again before the Serenity release, because all addresses will be
+    // contracts then.
+    assembly { size := extcodesize(addr) }  // solium-disable-line security/no-inline-assembly
     return size > 0;
   }
 

contracts/DayLimit.sol

@@ -61,7 +61,7 @@ contract DayLimit {
    * @return uint256 of today's index.
    */
   function today() private view returns (uint256) {
-    return now / 1 days;
+    return block.timestamp / 1 days;
   }
 
   /**

contracts/ECRecovery.sol

@@ -5,6 +5,10 @@ pragma solidity ^0.4.18;
  * @title Eliptic curve signature operations
  *
  * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d
+ *
+ * TODO Remove this library once solidity supports passing a signature to ecrecover.
+ * See https://github.com/ethereum/solidity/issues/864
+ *
  */
 
 library ECRecovery {
@@ -25,6 +29,9 @@ library ECRecovery {
     }
 
     // Divide the signature in r, s and v variables
+    // ecrecover takes the signature parameters, and the only way to get them
+    // currently is to use assembly.
+    // solium-disable-next-line security/no-inline-assembly
     assembly {
       r := mload(add(sig, 32))
       s := mload(add(sig, 64))

contracts/MerkleProof.sol

@@ -24,6 +24,7 @@ library MerkleProof {
     bytes32 computedHash = _leaf;
 
     for (uint256 i = 32; i <= _proof.length; i += 32) {
+      // solium-disable-next-line security/no-inline-assembly
       assembly {
         // Load the current element of the proof
         proofElement := mload(add(_proof, i))

contracts/crowdsale/Crowdsale.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
 import "../token/ERC20/ERC20.sol";
 import "../math/SafeMath.sol";
 
+
 /**
  * @title Crowdsale
  * @dev Crowdsale is a base contract for managing a token crowdsale,
@@ -11,11 +12,10 @@ import "../math/SafeMath.sol";
  * functionality and/or custom behavior.
  * The external interface represents the basic interface for purchasing tokens, and conform
  * the base architecture for crowdsales. They are *not* intended to be modified / overriden.
- * The internal interface conforms the extensible and modifiable surface of crowdsales. Override 
+ * The internal interface conforms the extensible and modifiable surface of crowdsales. Override
  * the methods to add functionality. Consider using 'super' where appropiate to concatenate
  * behavior.
  */
-
 contract Crowdsale {
   using SafeMath for uint256;
 

contracts/crowdsale/distribution/FinalizableCrowdsale.sol

@@ -4,6 +4,7 @@ import "../../math/SafeMath.sol";
 import "../../ownership/Ownable.sol";
 import "../validation/TimedCrowdsale.sol";
 
+
 /**
  * @title FinalizableCrowdsale
  * @dev Extension of Crowdsale where an owner can do extra work
@@ -37,4 +38,5 @@ contract FinalizableCrowdsale is TimedCrowdsale, Ownable {
    */
   function finalization() internal {
   }
+
 }

contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol

@@ -4,6 +4,7 @@ import "../validation/TimedCrowdsale.sol";
 import "../../token/ERC20/ERC20.sol";
 import "../../math/SafeMath.sol";
 
+
 /**
  * @title PostDeliveryCrowdsale
  * @dev Crowdsale that locks tokens from withdrawal until it ends.
@@ -13,15 +14,6 @@ contract PostDeliveryCrowdsale is TimedCrowdsale {
 
   mapping(address => uint256) public balances;
 
-  /**
-   * @dev Overrides parent by storing balances instead of issuing tokens right away.
-   * @param _beneficiary Token purchaser
-   * @param _tokenAmount Amount of tokens purchased
-   */
-  function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
-    balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount);
-  }
-
   /**
    * @dev Withdraw tokens only after crowdsale ends.
    */
@@ -32,4 +24,14 @@ contract PostDeliveryCrowdsale is TimedCrowdsale {
     balances[msg.sender] = 0;
     _deliverTokens(msg.sender, amount);
   }
+
+  /**
+   * @dev Overrides parent by storing balances instead of issuing tokens right away.
+   * @param _beneficiary Token purchaser
+   * @param _tokenAmount Amount of tokens purchased
+   */
+  function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
+    balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount);
+  }
+
 }

contracts/crowdsale/price/IncreasingPriceCrowdsale.sol

@@ -3,9 +3,10 @@ pragma solidity ^0.4.18;
 import "../validation/TimedCrowdsale.sol";
 import "../../math/SafeMath.sol";
 
+
 /**
  * @title IncreasingPriceCrowdsale
- * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time. 
+ * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time.
  * Note that what should be provided to the constructor is the initial and final _rates_, that is,
  * the amount of tokens per wei contributed. Thus, the initial rate must be greater than the final rate.
  */
@@ -28,12 +29,12 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale {
   }
 
   /**
-   * @dev Returns the rate of tokens per wei at the present time. 
-   * Note that, as price _increases_ with time, the rate _decreases_. 
+   * @dev Returns the rate of tokens per wei at the present time.
+   * Note that, as price _increases_ with time, the rate _decreases_.
    * @return The number of tokens a buyer gets per wei at a given time
    */
   function getCurrentRate() public view returns (uint256) {
-    uint256 elapsedTime = now.sub(openingTime);
+    uint256 elapsedTime = block.timestamp.sub(openingTime);
     uint256 timeRange = closingTime.sub(openingTime);
     uint256 rateRange = initialRate.sub(finalRate);
     return initialRate.sub(elapsedTime.mul(rateRange).div(timeRange));

contracts/crowdsale/validation/TimedCrowdsale.sol

@@ -15,10 +15,10 @@ contract TimedCrowdsale is Crowdsale {
   uint256 public closingTime;
 
   /**
-   * @dev Reverts if not in crowdsale time range. 
+   * @dev Reverts if not in crowdsale time range.
    */
   modifier onlyWhileOpen {
-    require(now >= openingTime && now <= closingTime);
+    require(block.timestamp >= openingTime && block.timestamp <= closingTime);
     _;
   }
 
@@ -28,7 +28,7 @@ contract TimedCrowdsale is Crowdsale {
    * @param _closingTime Crowdsale closing time
    */
   function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public {
-    require(_openingTime >= now);
+    require(_openingTime >= block.timestamp);
     require(_closingTime >= _openingTime);
 
     openingTime = _openingTime;
@@ -40,9 +40,9 @@ contract TimedCrowdsale is Crowdsale {
    * @return Whether crowdsale period has elapsed
    */
   function hasClosed() public view returns (bool) {
-    return now > closingTime;
+    return block.timestamp > closingTime;
   }
-  
+
   /**
    * @dev Extend parent behavior requiring to be within contributing period
    * @param _beneficiary Token purchaser

contracts/examples/SampleCrowdsale.sol

@@ -33,7 +33,16 @@ contract SampleCrowdsaleToken is MintableToken {
  */
 contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale {
 
-  function SampleCrowdsale(uint256 _openingTime, uint256 _closingTime, uint256 _rate, address _wallet, uint256 _cap, MintableToken _token, uint256 _goal) public
+  function SampleCrowdsale(
+    uint256 _openingTime,
+    uint256 _closingTime,
+    uint256 _rate,
+    address _wallet,
+    uint256 _cap,
+    MintableToken _token,
+    uint256 _goal
+  )
+    public
     Crowdsale(_rate, _wallet, _token)
     CappedCrowdsale(_cap)
     TimedCrowdsale(_openingTime, _closingTime)

contracts/mocks/ERC223TokenMock.sol

@@ -2,10 +2,12 @@ pragma solidity ^0.4.18;
 
 import "../token/ERC20/BasicToken.sol";
 
+
 contract ERC223ContractInterface {
   function tokenFallback(address _from, uint256 _value, bytes _data) external;
 }
 
+
 contract ERC223TokenMock is BasicToken {
 
   function ERC223TokenMock(address initialAccount, uint256 initialBalance) public {
@@ -18,11 +20,11 @@ contract ERC223TokenMock is BasicToken {
     returns (bool success)
   {
     transfer(_to, _value);
-    bool is_contract = false;
+    bool isContract = false;
     assembly {
-      is_contract := not(iszero(extcodesize(_to)))
+      isContract := not(iszero(extcodesize(_to)))
     }
-    if (is_contract) {
+    if (isContract) {
       ERC223ContractInterface receiver = ERC223ContractInterface(_to);
       receiver.tokenFallback(msg.sender, _value, _data);
     }

contracts/mocks/ERC721BasicTokenMock.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
 
 import "../token/ERC721/ERC721BasicToken.sol";
 
+
 /**
  * @title ERC721BasicTokenMock
  * This mock just provides a public mint and burn functions for testing purposes

contracts/mocks/ERC721ReceiverMock.sol

@@ -2,10 +2,11 @@ pragma solidity ^0.4.18;
 
 import "../token/ERC721/ERC721Receiver.sol";
 
+
 contract ERC721ReceiverMock is ERC721Receiver {
   bytes4 retval;
   bool reverts;
-  
+
   event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas);
 
   function ERC721ReceiverMock(bytes4 _retval, bool _reverts) public {

contracts/mocks/ERC721TokenMock.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
 
 import "../token/ERC721/ERC721Token.sol";
 
+
 /**
  * @title ERC721TokenMock
  * This mock just provides a public mint and burn functions for testing purposes,
@@ -23,4 +24,4 @@ contract ERC721TokenMock is ERC721Token {
   function setTokenURI(uint256 _tokenId, string _uri) public {
     super._setTokenURI(_tokenId, _uri);
   }
-}
+}

contracts/mocks/MessageHelper.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.4.11;
 
+
 contract MessageHelper {
 
   event Show(bytes32 b32, uint256 number, string text);

contracts/mocks/RefundableCrowdsaleImpl.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
 import "../token/ERC20/MintableToken.sol";
 import "../crowdsale/distribution/RefundableCrowdsale.sol";
 
+
 contract RefundableCrowdsaleImpl is RefundableCrowdsale {
 
   function RefundableCrowdsaleImpl (
@@ -12,7 +13,7 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
     address _wallet,
     MintableToken _token,
     uint256 _goal
-  ) 
+  )
     public
     Crowdsale(_rate, _wallet, _token)
     TimedCrowdsale(_openingTime, _closingTime)

contracts/mocks/StandardTokenMock.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
 
 import "../token/ERC20/StandardToken.sol";
 
+
 // mock class using StandardToken
 contract StandardTokenMock is StandardToken {
 

contracts/mocks/TimedCrowdsaleImpl.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
 import "../token/ERC20/ERC20.sol";
 import "../crowdsale/validation/TimedCrowdsale.sol";
 
+
 contract TimedCrowdsaleImpl is TimedCrowdsale {
 
   function TimedCrowdsaleImpl (
@@ -11,7 +12,7 @@ contract TimedCrowdsaleImpl is TimedCrowdsale {
     uint256 _rate,
     address _wallet,
     ERC20 _token
-  ) 
+  )
     public
     Crowdsale(_rate, _wallet, _token)
     TimedCrowdsale(_openingTime, _closingTime)

contracts/token/ERC20/SafeERC20.sol

@@ -15,7 +15,14 @@ library SafeERC20 {
     assert(token.transfer(to, value));
   }
 
-  function safeTransferFrom(ERC20 token, address from, address to, uint256 value) internal {
+  function safeTransferFrom(
+    ERC20 token,
+    address from,
+    address to,
+    uint256 value
+  )
+    internal
+  {
     assert(token.transferFrom(from, to, value));
   }
 

contracts/token/ERC20/TokenTimelock.sol

@@ -21,7 +21,7 @@ contract TokenTimelock {
   uint256 public releaseTime;
 
   function TokenTimelock(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public {
-    require(_releaseTime > now);
+    require(_releaseTime > block.timestamp);
     token = _token;
     beneficiary = _beneficiary;
     releaseTime = _releaseTime;
@@ -31,7 +31,7 @@ contract TokenTimelock {
    * @notice Transfers tokens held by timelock to beneficiary.
    */
   function release() public {
-    require(now >= releaseTime);
+    require(block.timestamp >= releaseTime);
 
     uint256 amount = token.balanceOf(this);
     require(amount > 0);