Replaced Solium in favor of Solhint (#1575)
* Adding solhint, working on style fixes. * Upgraded to solhint 1.5.0. * Removed all references to Solium * Updated mocks to make the pass the new linter rules. * Reformatted the .solhint.json file a bit. * Removed Solium configuration files. * Remove Solium dependency. * Add comment explaing disabled time rule in TokenVesting. * Revert to the old (ugly?) style. * Revert SignatureBouncerMock style. * Fix ERC165InterfacesSupported interface.
This commit is contained in:
@ -8,7 +8,8 @@ import "../../math/SafeMath.sol";
|
||||
*
|
||||
* @dev Implementation of the basic standard token.
|
||||
* https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md
|
||||
* Originally based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
|
||||
* Originally based on code by FirstBlood:
|
||||
* https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
|
||||
*
|
||||
* This implementation emits additional Approval events, allowing applications to reconstruct the allowance status for
|
||||
* all accounts just by listening to said events. Note that this isn't required by the specification, and other
|
||||
|
||||
@ -12,7 +12,7 @@ contract ERC20Pausable is ERC20, Pausable {
|
||||
return super.transfer(to, value);
|
||||
}
|
||||
|
||||
function transferFrom(address from,address to, uint256 value) public whenNotPaused returns (bool) {
|
||||
function transferFrom(address from, address to, uint256 value) public whenNotPaused returns (bool) {
|
||||
return super.transferFrom(from, to, value);
|
||||
}
|
||||
|
||||
|
||||
@ -5,18 +5,18 @@ pragma solidity ^0.5.0;
|
||||
* @dev see https://github.com/ethereum/EIPs/issues/20
|
||||
*/
|
||||
interface IERC20 {
|
||||
function totalSupply() external view returns (uint256);
|
||||
|
||||
function balanceOf(address who) external view returns (uint256);
|
||||
|
||||
function allowance(address owner, address spender) external view returns (uint256);
|
||||
|
||||
function transfer(address to, uint256 value) external returns (bool);
|
||||
|
||||
function approve(address spender, uint256 value) external returns (bool);
|
||||
|
||||
function transferFrom(address from, address to, uint256 value) external returns (bool);
|
||||
|
||||
function totalSupply() external view returns (uint256);
|
||||
|
||||
function balanceOf(address who) external view returns (uint256);
|
||||
|
||||
function allowance(address owner, address spender) external view returns (uint256);
|
||||
|
||||
event Transfer(address indexed from, address indexed to, uint256 value);
|
||||
|
||||
event Approval(address indexed owner, address indexed spender, uint256 value);
|
||||
|
||||
@ -20,7 +20,7 @@ contract TokenTimelock {
|
||||
uint256 private _releaseTime;
|
||||
|
||||
constructor (IERC20 token, address beneficiary, uint256 releaseTime) public {
|
||||
// solium-disable-next-line security/no-block-members
|
||||
// solhint-disable-next-line not-rely-on-time
|
||||
require(releaseTime > block.timestamp);
|
||||
_token = token;
|
||||
_beneficiary = beneficiary;
|
||||
@ -52,7 +52,7 @@ contract TokenTimelock {
|
||||
* @notice Transfers tokens held by timelock to beneficiary.
|
||||
*/
|
||||
function release() public {
|
||||
// solium-disable-next-line security/no-block-members
|
||||
// solhint-disable-next-line not-rely-on-time
|
||||
require(block.timestamp >= _releaseTime);
|
||||
|
||||
uint256 amount = _token.balanceOf(address(this));
|
||||
|
||||
Reference in New Issue
Block a user