From 05c7d8c861dfeb638036305ed720dc14f52ead9a Mon Sep 17 00:00:00 2001 From: Mikhail Melnik Date: Mon, 28 Jan 2019 22:04:50 +0300 Subject: [PATCH] fix identation and some linter warnings --- contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol | 1 - contracts/mocks/ForceEther.sol | 4 +++- contracts/mocks/MessageHelper.sol | 2 +- contracts/mocks/PausableCrowdsaleImpl.sol | 4 ++-- contracts/mocks/WhitelistedRoleMock.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 1 + contracts/token/ERC721/ERC721Full.sol | 2 +- contracts/token/ERC721/ERC721Metadata.sol | 7 ++++--- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol index ff7ac60ca..e8ed23f48 100644 --- a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol +++ b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol @@ -41,6 +41,5 @@ contract PostDeliveryCrowdsale is Initializable, TimedCrowdsale { _balances[beneficiary] = _balances[beneficiary].add(tokenAmount); } - uint256[50] private ______gap; } diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol index 9ac81d0e4..8e5149274 100644 --- a/contracts/mocks/ForceEther.sol +++ b/contracts/mocks/ForceEther.sol @@ -8,7 +8,9 @@ pragma solidity ^0.5.0; // @author Remco Bloemen contract ForceEther { - constructor() public payable { } + constructor() public payable { + // solhint-disable-previous-line no-empty-blocks + } function destroyAndSend(address payable recipient) public { selfdestruct(recipient); diff --git a/contracts/mocks/MessageHelper.sol b/contracts/mocks/MessageHelper.sol index 2afd680bb..edb74f0e4 100644 --- a/contracts/mocks/MessageHelper.sol +++ b/contracts/mocks/MessageHelper.sol @@ -40,7 +40,7 @@ contract MessageHelper { } function call(address _to, bytes memory _data) public returns (bool) { - // solium-disable-next-line security/no-low-level-calls + // solhint-disable-next-line security/avoid-low-level-calls (bool success,) = _to.call(_data); if (success) return true; diff --git a/contracts/mocks/PausableCrowdsaleImpl.sol b/contracts/mocks/PausableCrowdsaleImpl.sol index 6abe46eda..73f0dafff 100644 --- a/contracts/mocks/PausableCrowdsaleImpl.sol +++ b/contracts/mocks/PausableCrowdsaleImpl.sol @@ -5,7 +5,7 @@ import "../crowdsale/validation/PausableCrowdsale.sol"; contract PausableCrowdsaleImpl is PausableCrowdsale { constructor (uint256 _rate, address payable _wallet, ERC20 _token) public { - Crowdsale.initialize(_rate, _wallet, _token); - PausableCrowdsale.initialize(msg.sender); + Crowdsale.initialize(_rate, _wallet, _token); + PausableCrowdsale.initialize(msg.sender); } } diff --git a/contracts/mocks/WhitelistedRoleMock.sol b/contracts/mocks/WhitelistedRoleMock.sol index 5a9e9c7d2..10a54fdbd 100644 --- a/contracts/mocks/WhitelistedRoleMock.sol +++ b/contracts/mocks/WhitelistedRoleMock.sol @@ -4,7 +4,7 @@ import "../access/roles/WhitelistedRole.sol"; contract WhitelistedRoleMock is WhitelistedRole { constructor() public { - WhitelistedRole.initialize(msg.sender); + WhitelistedRole.initialize(msg.sender); } function onlyWhitelistedMock() public view onlyWhitelisted { diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 6399ecf64..f5c50323f 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -21,6 +21,7 @@ contract TokenTimelock is Initializable { uint256 private _releaseTime; function initialize (IERC20 token, address beneficiary, uint256 releaseTime) public initializer { + // solhint-disable-next-line not-rely-on-time require(releaseTime > block.timestamp); _token = token; _beneficiary = beneficiary; diff --git a/contracts/token/ERC721/ERC721Full.sol b/contracts/token/ERC721/ERC721Full.sol index d86ef9e93..fc9332f84 100644 --- a/contracts/token/ERC721/ERC721Full.sol +++ b/contracts/token/ERC721/ERC721Full.sol @@ -13,7 +13,7 @@ import "./ERC721Metadata.sol"; */ contract ERC721Full is Initializable, ERC721, ERC721Enumerable, ERC721Metadata { function initialize(string memory name, string memory symbol) public initializer { - ERC721Metadata.initialize(name, symbol); + ERC721Metadata.initialize(name, symbol); } uint256[50] private ______gap; diff --git a/contracts/token/ERC721/ERC721Metadata.sol b/contracts/token/ERC721/ERC721Metadata.sol index 0fbb1e6ae..5544f90b8 100644 --- a/contracts/token/ERC721/ERC721Metadata.sol +++ b/contracts/token/ERC721/ERC721Metadata.sol @@ -36,9 +36,10 @@ contract ERC721Metadata is Initializable, ERC165, ERC721, IERC721Metadata { _registerInterface(_INTERFACE_ID_ERC721_METADATA); } - function _hasBeenInitialized() internal view returns (bool) { - return supportsInterface(_INTERFACE_ID_ERC721_METADATA); -} + function _hasBeenInitialized() internal view returns (bool) { + return supportsInterface(_INTERFACE_ID_ERC721_METADATA); + } + /** * @dev Gets the token name * @return string representing the token name