From e60aee61f20d25bffa0a1f651247810a8bc8a660 Mon Sep 17 00:00:00 2001 From: Matt Condon Date: Mon, 15 Jan 2018 15:44:03 -0500 Subject: [PATCH] fix: solium errors - blank-line only --- contracts/DayLimit.sol | 1 + contracts/MerkleProof.sol | 1 + contracts/ReentrancyGuard.sol | 1 + contracts/crowdsale/CappedCrowdsale.sol | 1 + contracts/crowdsale/Crowdsale.sol | 1 + contracts/crowdsale/FinalizableCrowdsale.sol | 1 + contracts/crowdsale/RefundVault.sol | 1 + contracts/examples/SampleCrowdsale.sol | 2 ++ contracts/lifecycle/Migrations.sol | 2 +- contracts/lifecycle/TokenDestructible.sol | 2 +- contracts/math/Math.sol | 2 +- contracts/mocks/BurnableTokenMock.sol | 1 + contracts/mocks/DayLimitMock.sol | 2 ++ contracts/mocks/DetailedERC20Mock.sol | 1 + contracts/mocks/ERC23TokenMock.sol | 1 + contracts/mocks/ForceEther.sol | 1 + contracts/mocks/HasNoEtherTest.sol | 1 + contracts/mocks/InsecureTargetBounty.sol | 2 +- contracts/mocks/PausableTokenMock.sol | 1 + contracts/mocks/ReentrancyAttack.sol | 1 + contracts/mocks/ReentrancyMock.sol | 1 + contracts/mocks/SafeERC20Helper.sol | 3 +++ contracts/mocks/SecureTargetBounty.sol | 2 +- contracts/ownership/CanReclaimToken.sol | 1 + contracts/ownership/Contactable.sol | 1 + contracts/ownership/DelayedClaimable.sol | 2 -- contracts/ownership/HasNoContracts.sol | 1 + contracts/ownership/HasNoEther.sol | 1 + contracts/ownership/HasNoTokens.sol | 1 + contracts/ownership/NoOwner.sol | 1 + contracts/ownership/Ownable.sol | 2 -- contracts/ownership/rbac/RBAC.sol | 1 - contracts/payment/SplitPayment.sol | 1 + contracts/token/BurnableToken.sol | 1 + contracts/token/CappedToken.sol | 1 + contracts/token/DetailedERC20.sol | 1 + contracts/token/PausableToken.sol | 2 +- contracts/token/SafeERC20.sol | 1 + contracts/token/TokenTimelock.sol | 2 +- contracts/token/TokenVesting.sol | 1 + 40 files changed, 41 insertions(+), 12 deletions(-) diff --git a/contracts/DayLimit.sol b/contracts/DayLimit.sol index bf3f3cbf037..adacd7a62f5 100644 --- a/contracts/DayLimit.sol +++ b/contracts/DayLimit.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.18; + /** * @title DayLimit * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable) diff --git a/contracts/MerkleProof.sol b/contracts/MerkleProof.sol index d8ab7179525..78c33d6b95f 100644 --- a/contracts/MerkleProof.sol +++ b/contracts/MerkleProof.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.18; + /* * @title MerkleProof * @dev Merkle proof verification diff --git a/contracts/ReentrancyGuard.sol b/contracts/ReentrancyGuard.sol index 00daf58328d..0fc99f7a46d 100644 --- a/contracts/ReentrancyGuard.sol +++ b/contracts/ReentrancyGuard.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.18; + /** * @title Helps contracts guard agains reentrancy attacks. * @author Remco Bloemen diff --git a/contracts/crowdsale/CappedCrowdsale.sol b/contracts/crowdsale/CappedCrowdsale.sol index cd250df60e3..cbcbfac454c 100644 --- a/contracts/crowdsale/CappedCrowdsale.sol +++ b/contracts/crowdsale/CappedCrowdsale.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../math/SafeMath.sol"; import "./Crowdsale.sol"; + /** * @title CappedCrowdsale * @dev Extension of Crowdsale with a max amount of funds raised diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol index e9e2f248932..6618f9bfc1d 100644 --- a/contracts/crowdsale/Crowdsale.sol +++ b/contracts/crowdsale/Crowdsale.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../token/MintableToken.sol"; import "../math/SafeMath.sol"; + /** * @title Crowdsale * @dev Crowdsale is a base contract for managing a token crowdsale. diff --git a/contracts/crowdsale/FinalizableCrowdsale.sol b/contracts/crowdsale/FinalizableCrowdsale.sol index cf94aa033ca..f75e9de3936 100644 --- a/contracts/crowdsale/FinalizableCrowdsale.sol +++ b/contracts/crowdsale/FinalizableCrowdsale.sol @@ -4,6 +4,7 @@ import "../math/SafeMath.sol"; import "../ownership/Ownable.sol"; import "./Crowdsale.sol"; + /** * @title FinalizableCrowdsale * @dev Extension of Crowdsale where an owner can do extra work diff --git a/contracts/crowdsale/RefundVault.sol b/contracts/crowdsale/RefundVault.sol index 0657e8e42c7..bf600000047 100644 --- a/contracts/crowdsale/RefundVault.sol +++ b/contracts/crowdsale/RefundVault.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../math/SafeMath.sol"; import "../ownership/Ownable.sol"; + /** * @title RefundVault * @dev This contract is used for storing funds while a crowdsale diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol index 3c7672219c2..1ffeec2dc6d 100644 --- a/contracts/examples/SampleCrowdsale.sol +++ b/contracts/examples/SampleCrowdsale.sol @@ -4,6 +4,7 @@ import "../crowdsale/CappedCrowdsale.sol"; import "../crowdsale/RefundableCrowdsale.sol"; import "../token/MintableToken.sol"; + /** * @title SampleCrowdsaleToken * @dev Very simple ERC20 Token that can be minted. @@ -17,6 +18,7 @@ contract SampleCrowdsaleToken is MintableToken { } + /** * @title SampleCrowdsale * @dev This is an example of a fully fledged crowdsale. diff --git a/contracts/lifecycle/Migrations.sol b/contracts/lifecycle/Migrations.sol index c8f93085544..72314f2f7fd 100644 --- a/contracts/lifecycle/Migrations.sol +++ b/contracts/lifecycle/Migrations.sol @@ -1,8 +1,8 @@ pragma solidity ^0.4.18; - import "../ownership/Ownable.sol"; + /** * @title Migrations * @dev This is a truffle contract, needed for truffle integration, not meant for use by Zeppelin users. diff --git a/contracts/lifecycle/TokenDestructible.sol b/contracts/lifecycle/TokenDestructible.sol index 8eaad04fd44..fa13c9241c8 100644 --- a/contracts/lifecycle/TokenDestructible.sol +++ b/contracts/lifecycle/TokenDestructible.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.18; - import "../ownership/Ownable.sol"; import "../token/ERC20Basic.sol"; + /** * @title TokenDestructible: * @author Remco Bloemen diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol index 5d09ee6ff31..943953266ad 100644 --- a/contracts/math/Math.sol +++ b/contracts/math/Math.sol @@ -1,10 +1,10 @@ pragma solidity ^0.4.18; + /** * @title Math * @dev Assorted math operations */ - library Math { function max64(uint64 a, uint64 b) internal pure returns (uint64) { return a >= b ? a : b; diff --git a/contracts/mocks/BurnableTokenMock.sol b/contracts/mocks/BurnableTokenMock.sol index c6ae40502bd..07b5bf02ea4 100644 --- a/contracts/mocks/BurnableTokenMock.sol +++ b/contracts/mocks/BurnableTokenMock.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "../token/BurnableToken.sol"; + contract BurnableTokenMock is BurnableToken { function BurnableTokenMock(address initialAccount, uint initialBalance) public { diff --git a/contracts/mocks/DayLimitMock.sol b/contracts/mocks/DayLimitMock.sol index e40ab1221d0..78139ccdf9d 100644 --- a/contracts/mocks/DayLimitMock.sol +++ b/contracts/mocks/DayLimitMock.sol @@ -1,6 +1,8 @@ pragma solidity ^0.4.18; + import "../../contracts/DayLimit.sol"; + contract DayLimitMock is DayLimit { uint256 public totalSpending; diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 96548df06d2..83fc96b3802 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../token/StandardToken.sol"; import "../token/DetailedERC20.sol"; + contract DetailedERC20Mock is StandardToken, DetailedERC20 { function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {} } diff --git a/contracts/mocks/ERC23TokenMock.sol b/contracts/mocks/ERC23TokenMock.sol index f7bd273e5bf..8c826c2b09f 100644 --- a/contracts/mocks/ERC23TokenMock.sol +++ b/contracts/mocks/ERC23TokenMock.sol @@ -8,6 +8,7 @@ contract ERC23ContractInterface { function tokenFallback(address _from, uint256 _value, bytes _data) external; } + contract ERC23TokenMock is BasicToken { function ERC23TokenMock(address initialAccount, uint256 initialBalance) public { diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol index 0206b19dab1..9ab4a887b68 100644 --- a/contracts/mocks/ForceEther.sol +++ b/contracts/mocks/ForceEther.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.18; + // @title Force Ether into a contract. // @notice even // if the contract is not payable. diff --git a/contracts/mocks/HasNoEtherTest.sol b/contracts/mocks/HasNoEtherTest.sol index 5a51c185577..6bb40325399 100644 --- a/contracts/mocks/HasNoEtherTest.sol +++ b/contracts/mocks/HasNoEtherTest.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "../../contracts/ownership/HasNoEther.sol"; + contract HasNoEtherTest is HasNoEther { // Constructor with explicit payable — should still fail diff --git a/contracts/mocks/InsecureTargetBounty.sol b/contracts/mocks/InsecureTargetBounty.sol index 87e3bf8b68a..5907aa1e12a 100644 --- a/contracts/mocks/InsecureTargetBounty.sol +++ b/contracts/mocks/InsecureTargetBounty.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.18; - import {Bounty, Target} from "../../contracts/Bounty.sol"; @@ -10,6 +9,7 @@ contract InsecureTargetMock is Target { } } + contract InsecureTargetBounty is Bounty { function deployContract() internal returns (address) { return new InsecureTargetMock(); diff --git a/contracts/mocks/PausableTokenMock.sol b/contracts/mocks/PausableTokenMock.sol index 416498e9e6b..447577bcdbb 100644 --- a/contracts/mocks/PausableTokenMock.sol +++ b/contracts/mocks/PausableTokenMock.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "../token/PausableToken.sol"; + // mock class using PausableToken contract PausableTokenMock is PausableToken { diff --git a/contracts/mocks/ReentrancyAttack.sol b/contracts/mocks/ReentrancyAttack.sol index 870bcf78e43..cbed1356649 100644 --- a/contracts/mocks/ReentrancyAttack.sol +++ b/contracts/mocks/ReentrancyAttack.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.18; + contract ReentrancyAttack { function callSender(bytes4 data) public { diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol index 396e17fbf98..970586cdf41 100644 --- a/contracts/mocks/ReentrancyMock.sol +++ b/contracts/mocks/ReentrancyMock.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../ReentrancyGuard.sol"; import "./ReentrancyAttack.sol"; + contract ReentrancyMock is ReentrancyGuard { uint256 public counter; diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol index ccfe63cead9..d41e7a5e1aa 100644 --- a/contracts/mocks/SafeERC20Helper.sol +++ b/contracts/mocks/SafeERC20Helper.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "../token/ERC20.sol"; import "../token/SafeERC20.sol"; + contract ERC20FailingMock is ERC20 { function transfer(address, uint256) public returns (bool) { return false; @@ -25,6 +26,7 @@ contract ERC20FailingMock is ERC20 { } } + contract ERC20SucceedingMock is ERC20 { function transfer(address, uint256) public returns (bool) { return true; @@ -47,6 +49,7 @@ contract ERC20SucceedingMock is ERC20 { } } + contract SafeERC20Helper { using SafeERC20 for ERC20; diff --git a/contracts/mocks/SecureTargetBounty.sol b/contracts/mocks/SecureTargetBounty.sol index aed4639492d..066f44882e1 100644 --- a/contracts/mocks/SecureTargetBounty.sol +++ b/contracts/mocks/SecureTargetBounty.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.18; - import {Bounty, Target} from "../../contracts/Bounty.sol"; @@ -10,6 +9,7 @@ contract SecureTargetMock is Target { } } + contract SecureTargetBounty is Bounty { function deployContract() internal returns (address) { return new SecureTargetMock(); diff --git a/contracts/ownership/CanReclaimToken.sol b/contracts/ownership/CanReclaimToken.sol index d948393ac38..ab85e173652 100644 --- a/contracts/ownership/CanReclaimToken.sol +++ b/contracts/ownership/CanReclaimToken.sol @@ -4,6 +4,7 @@ import "./Ownable.sol"; import "../token/ERC20Basic.sol"; import "../token/SafeERC20.sol"; + /** * @title Contracts that should be able to recover tokens * @author SylTi diff --git a/contracts/ownership/Contactable.sol b/contracts/ownership/Contactable.sol index 293904a14bc..4aa1e13a3e9 100644 --- a/contracts/ownership/Contactable.sol +++ b/contracts/ownership/Contactable.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./Ownable.sol"; + /** * @title Contactable token * @dev Basic version of a contactable contract, allowing the owner to provide a string with their diff --git a/contracts/ownership/DelayedClaimable.sol b/contracts/ownership/DelayedClaimable.sol index d42481a5df8..857ea39bbcc 100644 --- a/contracts/ownership/DelayedClaimable.sol +++ b/contracts/ownership/DelayedClaimable.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.18; - import "./Claimable.sol"; @@ -26,7 +25,6 @@ contract DelayedClaimable is Claimable { start = _start; } - /** * @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within * the specified start and end time. diff --git a/contracts/ownership/HasNoContracts.sol b/contracts/ownership/HasNoContracts.sol index 1b7387530b7..7cc87b524de 100644 --- a/contracts/ownership/HasNoContracts.sol +++ b/contracts/ownership/HasNoContracts.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./Ownable.sol"; + /** * @title Contracts that should not own Contracts * @author Remco Bloemen diff --git a/contracts/ownership/HasNoEther.sol b/contracts/ownership/HasNoEther.sol index 238424ad93f..8c2f490a987 100644 --- a/contracts/ownership/HasNoEther.sol +++ b/contracts/ownership/HasNoEther.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./Ownable.sol"; + /** * @title Contracts that should not own Ether * @author Remco Bloemen diff --git a/contracts/ownership/HasNoTokens.sol b/contracts/ownership/HasNoTokens.sol index f7f7e348a30..9a4e7aabe67 100644 --- a/contracts/ownership/HasNoTokens.sol +++ b/contracts/ownership/HasNoTokens.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./CanReclaimToken.sol"; + /** * @title Contracts that should not own Tokens * @author Remco Bloemen diff --git a/contracts/ownership/NoOwner.sol b/contracts/ownership/NoOwner.sol index 160d5b57de2..6206e8998b6 100644 --- a/contracts/ownership/NoOwner.sol +++ b/contracts/ownership/NoOwner.sol @@ -4,6 +4,7 @@ import "./HasNoEther.sol"; import "./HasNoTokens.sol"; import "./HasNoContracts.sol"; + /** * @title Base contract for contracts that should not own things. * @author Remco Bloemen diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 0e274491455..54158a2a3f7 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -21,7 +21,6 @@ contract Ownable { owner = msg.sender; } - /** * @dev Throws if called by any account other than the owner. */ @@ -30,7 +29,6 @@ contract Ownable { _; } - /** * @dev Allows the current owner to transfer control of the contract to a newOwner. * @param newOwner The address to transfer ownership to. diff --git a/contracts/ownership/rbac/RBAC.sol b/contracts/ownership/rbac/RBAC.sol index 3a25737b82f..51a8a0550f1 100644 --- a/contracts/ownership/rbac/RBAC.sol +++ b/contracts/ownership/rbac/RBAC.sol @@ -111,7 +111,6 @@ contract RBAC { removeRole(addr, roleName); } - /** * @dev modifier to scope access to a single role (uses msg.sender as addr) * @param roleName the name of the role diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index e052c1553ed..e9326f9c307 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "../math/SafeMath.sol"; + /** * @title SplitPayment * @dev Base contract that supports multiple payees claiming funds sent to this contract diff --git a/contracts/token/BurnableToken.sol b/contracts/token/BurnableToken.sol index ea915761adb..9cbc2be056c 100644 --- a/contracts/token/BurnableToken.sol +++ b/contracts/token/BurnableToken.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./BasicToken.sol"; + /** * @title Burnable Token * @dev Token that can be irreversibly burned (destroyed). diff --git a/contracts/token/CappedToken.sol b/contracts/token/CappedToken.sol index cc35b95d638..ee55e202d98 100644 --- a/contracts/token/CappedToken.sol +++ b/contracts/token/CappedToken.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.11; import "./MintableToken.sol"; + /** * @title Capped token * @dev Mintable token with a token cap. diff --git a/contracts/token/DetailedERC20.sol b/contracts/token/DetailedERC20.sol index 477cd4a6650..21897a43bd9 100644 --- a/contracts/token/DetailedERC20.sol +++ b/contracts/token/DetailedERC20.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.18; import "./ERC20.sol"; + contract DetailedERC20 is ERC20 { string public name; string public symbol; diff --git a/contracts/token/PausableToken.sol b/contracts/token/PausableToken.sol index 1b83f80e47f..4ba35112665 100644 --- a/contracts/token/PausableToken.sol +++ b/contracts/token/PausableToken.sol @@ -3,12 +3,12 @@ pragma solidity ^0.4.18; import "./StandardToken.sol"; import "../lifecycle/Pausable.sol"; + /** * @title Pausable token * * @dev StandardToken modified with pausable transfers. **/ - contract PausableToken is StandardToken, Pausable { function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) { diff --git a/contracts/token/SafeERC20.sol b/contracts/token/SafeERC20.sol index 81b76cd4f9e..1cf3adfab0c 100644 --- a/contracts/token/SafeERC20.sol +++ b/contracts/token/SafeERC20.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "./ERC20Basic.sol"; import "./ERC20.sol"; + /** * @title SafeERC20 * @dev Wrappers around ERC20 operations that throw on failure. diff --git a/contracts/token/TokenTimelock.sol b/contracts/token/TokenTimelock.sol index 267319386d6..3fd0103a518 100644 --- a/contracts/token/TokenTimelock.sol +++ b/contracts/token/TokenTimelock.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.18; - import "./ERC20Basic.sol"; import "../token/SafeERC20.sol"; + /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a diff --git a/contracts/token/TokenVesting.sol b/contracts/token/TokenVesting.sol index 65bd67ea27e..01bdff34e7c 100644 --- a/contracts/token/TokenVesting.sol +++ b/contracts/token/TokenVesting.sol @@ -5,6 +5,7 @@ import "./SafeERC20.sol"; import "../ownership/Ownable.sol"; import "../math/SafeMath.sol"; + /** * @title TokenVesting * @dev A token holder contract that can release its token balance gradually like a