From 9b3710465583284b8c4c5d2245749246bb2e0094 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 19 Sep 2018 19:59:13 -0300 Subject: [PATCH] Turn off blank-lines Solium rule (#1284) * turn off blank-lines rule * remove triple newlines --- .soliumrc.json | 1 + contracts/access/Roles.sol | 1 - contracts/access/roles/CapperRole.sol | 1 - contracts/access/roles/MinterRole.sol | 1 - contracts/access/roles/PauserRole.sol | 1 - contracts/access/roles/SignerRole.sol | 1 - contracts/bounties/BreakInvariantBounty.sol | 3 --- contracts/crowdsale/Crowdsale.sol | 1 - contracts/crowdsale/distribution/FinalizableCrowdsale.sol | 1 - contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol | 1 - contracts/crowdsale/distribution/RefundableCrowdsale.sol | 2 -- contracts/crowdsale/emission/AllowanceCrowdsale.sol | 1 - contracts/crowdsale/emission/MintedCrowdsale.sol | 1 - contracts/crowdsale/price/IncreasingPriceCrowdsale.sol | 1 - contracts/crowdsale/validation/CappedCrowdsale.sol | 1 - contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol | 1 - contracts/crowdsale/validation/TimedCrowdsale.sol | 1 - contracts/cryptography/ECDSA.sol | 1 - contracts/cryptography/MerkleProof.sol | 1 - contracts/drafts/Counter.sol | 1 - contracts/drafts/ERC1046/TokenMetadata.sol | 2 -- contracts/drafts/ERC20Migrator.sol | 1 - contracts/drafts/SignatureBouncer.sol | 1 - contracts/drafts/TokenVesting.sol | 1 - contracts/examples/SampleCrowdsale.sol | 2 -- contracts/examples/SimpleToken.sol | 2 -- contracts/introspection/ERC165.sol | 1 - contracts/introspection/ERC165Checker.sol | 2 -- contracts/introspection/IERC165.sol | 1 - contracts/lifecycle/Pausable.sol | 2 -- contracts/math/Math.sol | 1 - contracts/math/SafeMath.sol | 1 - contracts/mocks/AddressImpl.sol | 1 - contracts/mocks/AllowanceCrowdsaleImpl.sol | 1 - contracts/mocks/CappedCrowdsaleImpl.sol | 1 - contracts/mocks/CapperRoleMock.sol | 1 - contracts/mocks/ConditionalEscrowMock.sol | 2 -- contracts/mocks/CounterImpl.sol | 1 - contracts/mocks/DetailedERC20Mock.sol | 1 - contracts/mocks/ECDSAMock.sol | 2 -- contracts/mocks/ERC165/ERC165InterfacesSupported.sol | 3 --- contracts/mocks/ERC165/ERC165NotSupported.sol | 1 - contracts/mocks/ERC165CheckerMock.sol | 1 - contracts/mocks/ERC165Mock.sol | 1 - contracts/mocks/ERC20BurnableMock.sol | 1 - contracts/mocks/ERC20MintableMock.sol | 1 - contracts/mocks/ERC20Mock.sol | 1 - contracts/mocks/ERC20PausableMock.sol | 1 - contracts/mocks/ERC20WithMetadataMock.sol | 1 - contracts/mocks/ERC721FullMock.sol | 1 - contracts/mocks/ERC721MintableBurnableImpl.sol | 1 - contracts/mocks/ERC721Mock.sol | 1 - contracts/mocks/ERC721PausableMock.sol | 1 - contracts/mocks/ERC721ReceiverMock.sol | 1 - contracts/mocks/FinalizableCrowdsaleImpl.sol | 1 - contracts/mocks/ForceEther.sol | 1 - contracts/mocks/IncreasingPriceCrowdsaleImpl.sol | 1 - contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol | 1 - contracts/mocks/InsecureInvariantTargetBounty.sol | 2 -- contracts/mocks/MathMock.sol | 2 -- contracts/mocks/MerkleProofWrapper.sol | 1 - contracts/mocks/MessageHelper.sol | 1 - contracts/mocks/MintedCrowdsaleImpl.sol | 1 - contracts/mocks/MinterRoleMock.sol | 1 - contracts/mocks/PausableMock.sol | 2 -- contracts/mocks/PauserRoleMock.sol | 1 - contracts/mocks/PostDeliveryCrowdsaleImpl.sol | 1 - contracts/mocks/PullPaymentMock.sol | 2 -- contracts/mocks/ReentrancyAttack.sol | 1 - contracts/mocks/ReentrancyMock.sol | 1 - contracts/mocks/RefundableCrowdsaleImpl.sol | 1 - contracts/mocks/RolesMock.sol | 1 - contracts/mocks/SafeERC20Helper.sol | 3 --- contracts/mocks/SafeMathMock.sol | 2 -- contracts/mocks/SecondaryMock.sol | 1 - contracts/mocks/SecureInvariantTargetBounty.sol | 2 -- contracts/mocks/SignatureBouncerMock.sol | 1 - contracts/mocks/SignerRoleMock.sol | 1 - contracts/mocks/TimedCrowdsaleImpl.sol | 1 - contracts/ownership/Ownable.sol | 3 --- contracts/ownership/Secondary.sol | 1 - contracts/payment/ConditionalEscrow.sol | 1 - contracts/payment/Escrow.sol | 1 - contracts/payment/PullPayment.sol | 1 - contracts/payment/RefundEscrow.sol | 1 - contracts/payment/SplitPayment.sol | 1 - contracts/token/ERC20/ERC20.sol | 1 - contracts/token/ERC20/ERC20Burnable.sol | 1 - contracts/token/ERC20/ERC20Capped.sol | 1 - contracts/token/ERC20/ERC20Detailed.sol | 1 - contracts/token/ERC20/ERC20Mintable.sol | 1 - contracts/token/ERC20/ERC20Pausable.sol | 1 - contracts/token/ERC20/IERC20.sol | 1 - contracts/token/ERC20/SafeERC20.sol | 1 - contracts/token/ERC20/TokenTimelock.sol | 1 - contracts/token/ERC721/ERC721.sol | 1 - contracts/token/ERC721/ERC721Burnable.sol | 1 - contracts/token/ERC721/ERC721Enumerable.sol | 1 - contracts/token/ERC721/ERC721Full.sol | 1 - contracts/token/ERC721/ERC721Holder.sol | 1 - contracts/token/ERC721/ERC721Metadata.sol | 1 - contracts/token/ERC721/ERC721Mintable.sol | 1 - contracts/token/ERC721/ERC721Pausable.sol | 1 - contracts/token/ERC721/IERC721.sol | 1 - contracts/token/ERC721/IERC721Enumerable.sol | 1 - contracts/token/ERC721/IERC721Full.sol | 1 - contracts/token/ERC721/IERC721Metadata.sol | 1 - contracts/token/ERC721/IERC721Receiver.sol | 1 - contracts/utils/Address.sol | 1 - contracts/utils/ReentrancyGuard.sol | 1 - 110 files changed, 1 insertion(+), 131 deletions(-) diff --git a/.soliumrc.json b/.soliumrc.json index be4afce10..8fe25b30e 100644 --- a/.soliumrc.json +++ b/.soliumrc.json @@ -2,6 +2,7 @@ "extends": "solium:all", "plugins": ["security"], "rules": { + "blank-lines": "off", "error-reason": "off", "indentation": ["error", 2], "lbrace": "off", diff --git a/contracts/access/Roles.sol b/contracts/access/Roles.sol index b0212c2be..930a62066 100644 --- a/contracts/access/Roles.sol +++ b/contracts/access/Roles.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Roles * @dev Library for managing addresses assigned to a Role. diff --git a/contracts/access/roles/CapperRole.sol b/contracts/access/roles/CapperRole.sol index a37a119e8..756cdd48f 100644 --- a/contracts/access/roles/CapperRole.sol +++ b/contracts/access/roles/CapperRole.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../Roles.sol"; - contract CapperRole { using Roles for Roles.Role; diff --git a/contracts/access/roles/MinterRole.sol b/contracts/access/roles/MinterRole.sol index 74b22ccf3..cc95473c7 100644 --- a/contracts/access/roles/MinterRole.sol +++ b/contracts/access/roles/MinterRole.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../Roles.sol"; - contract MinterRole { using Roles for Roles.Role; diff --git a/contracts/access/roles/PauserRole.sol b/contracts/access/roles/PauserRole.sol index e6c4e6da7..06347e7cf 100644 --- a/contracts/access/roles/PauserRole.sol +++ b/contracts/access/roles/PauserRole.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../Roles.sol"; - contract PauserRole { using Roles for Roles.Role; diff --git a/contracts/access/roles/SignerRole.sol b/contracts/access/roles/SignerRole.sol index a6ab48305..e2729a255 100644 --- a/contracts/access/roles/SignerRole.sol +++ b/contracts/access/roles/SignerRole.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../Roles.sol"; - contract SignerRole { using Roles for Roles.Role; diff --git a/contracts/bounties/BreakInvariantBounty.sol b/contracts/bounties/BreakInvariantBounty.sol index 58d725980..016d3f2f5 100644 --- a/contracts/bounties/BreakInvariantBounty.sol +++ b/contracts/bounties/BreakInvariantBounty.sol @@ -1,10 +1,8 @@ pragma solidity ^0.4.24; - import "../payment/PullPayment.sol"; import "../ownership/Ownable.sol"; - /** * @title BreakInvariantBounty * @dev This bounty will pay out to a researcher if they break invariant logic of the contract. @@ -70,7 +68,6 @@ contract BreakInvariantBounty is PullPayment, Ownable { } - /** * @title Target * @dev Your main contract should inherit from this class and implement the checkInvariant method. diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol index dd036a352..c1302ede4 100644 --- a/contracts/crowdsale/Crowdsale.sol +++ b/contracts/crowdsale/Crowdsale.sol @@ -4,7 +4,6 @@ import "../token/ERC20/IERC20.sol"; import "../math/SafeMath.sol"; import "../token/ERC20/SafeERC20.sol"; - /** * @title Crowdsale * @dev Crowdsale is a base contract for managing a token crowdsale, diff --git a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol index c6995a44d..37d205c8e 100644 --- a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol +++ b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../../math/SafeMath.sol"; import "../validation/TimedCrowdsale.sol"; - /** * @title FinalizableCrowdsale * @dev Extension of Crowdsale with a one-off finalization action, where one diff --git a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol index 5a7d89c7e..da9392aed 100644 --- a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol +++ b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol @@ -4,7 +4,6 @@ import "../validation/TimedCrowdsale.sol"; import "../../token/ERC20/IERC20.sol"; import "../../math/SafeMath.sol"; - /** * @title PostDeliveryCrowdsale * @dev Crowdsale that locks tokens from withdrawal until it ends. diff --git a/contracts/crowdsale/distribution/RefundableCrowdsale.sol b/contracts/crowdsale/distribution/RefundableCrowdsale.sol index 80db88d41..a69d4a0ed 100644 --- a/contracts/crowdsale/distribution/RefundableCrowdsale.sol +++ b/contracts/crowdsale/distribution/RefundableCrowdsale.sol @@ -1,11 +1,9 @@ pragma solidity ^0.4.24; - import "../../math/SafeMath.sol"; import "./FinalizableCrowdsale.sol"; import "../../payment/RefundEscrow.sol"; - /** * @title RefundableCrowdsale * @dev Extension of Crowdsale contract that adds a funding goal, and diff --git a/contracts/crowdsale/emission/AllowanceCrowdsale.sol b/contracts/crowdsale/emission/AllowanceCrowdsale.sol index 2af6752fb..736635e0b 100644 --- a/contracts/crowdsale/emission/AllowanceCrowdsale.sol +++ b/contracts/crowdsale/emission/AllowanceCrowdsale.sol @@ -5,7 +5,6 @@ import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/SafeERC20.sol"; import "../../math/SafeMath.sol"; - /** * @title AllowanceCrowdsale * @dev Extension of Crowdsale where tokens are held by a wallet, which approves an allowance to the crowdsale. diff --git a/contracts/crowdsale/emission/MintedCrowdsale.sol b/contracts/crowdsale/emission/MintedCrowdsale.sol index a57c7b807..62b03189a 100644 --- a/contracts/crowdsale/emission/MintedCrowdsale.sol +++ b/contracts/crowdsale/emission/MintedCrowdsale.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../Crowdsale.sol"; import "../../token/ERC20/ERC20Mintable.sol"; - /** * @title MintedCrowdsale * @dev Extension of Crowdsale contract whose tokens are minted in each purchase. diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol index 2d07c6763..386c6202b 100644 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../validation/TimedCrowdsale.sol"; import "../../math/SafeMath.sol"; - /** * @title IncreasingPriceCrowdsale * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time. diff --git a/contracts/crowdsale/validation/CappedCrowdsale.sol b/contracts/crowdsale/validation/CappedCrowdsale.sol index 67a7d7c92..21708c34a 100644 --- a/contracts/crowdsale/validation/CappedCrowdsale.sol +++ b/contracts/crowdsale/validation/CappedCrowdsale.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; - /** * @title CappedCrowdsale * @dev Crowdsale with a limit for total contributions. diff --git a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol index d2033984f..d00cb602e 100644 --- a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol +++ b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol @@ -4,7 +4,6 @@ import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; import "../../access/roles/CapperRole.sol"; - /** * @title IndividuallyCappedCrowdsale * @dev Crowdsale with per-beneficiary caps. diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol index abbf1d116..098112cae 100644 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ b/contracts/crowdsale/validation/TimedCrowdsale.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; - /** * @title TimedCrowdsale * @dev Crowdsale accepting contributions only within a time frame. diff --git a/contracts/cryptography/ECDSA.sol b/contracts/cryptography/ECDSA.sol index 61d19f20c..3f0ad1bd2 100644 --- a/contracts/cryptography/ECDSA.sol +++ b/contracts/cryptography/ECDSA.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Elliptic curve signature operations * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d diff --git a/contracts/cryptography/MerkleProof.sol b/contracts/cryptography/MerkleProof.sol index d490e7ff5..a0c304c57 100644 --- a/contracts/cryptography/MerkleProof.sol +++ b/contracts/cryptography/MerkleProof.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title MerkleProof * @dev Merkle proof verification based on diff --git a/contracts/drafts/Counter.sol b/contracts/drafts/Counter.sol index b47d9b824..3557bd744 100644 --- a/contracts/drafts/Counter.sol +++ b/contracts/drafts/Counter.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Counter * @author Matt Condon (@shrugs) diff --git a/contracts/drafts/ERC1046/TokenMetadata.sol b/contracts/drafts/ERC1046/TokenMetadata.sol index a85dac1f3..85b6ec671 100644 --- a/contracts/drafts/ERC1046/TokenMetadata.sol +++ b/contracts/drafts/ERC1046/TokenMetadata.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../../token/ERC20/IERC20.sol"; - /** * @title ERC-1047 Token Metadata * @dev See https://eips.ethereum.org/EIPS/eip-1046 @@ -13,7 +12,6 @@ contract ERC20TokenMetadata is IERC20 { function tokenURI() external view returns (string); } - contract ERC20WithMetadata is ERC20TokenMetadata { string private _tokenURI = ""; diff --git a/contracts/drafts/ERC20Migrator.sol b/contracts/drafts/ERC20Migrator.sol index 69e745f14..44ed16423 100644 --- a/contracts/drafts/ERC20Migrator.sol +++ b/contracts/drafts/ERC20Migrator.sol @@ -5,7 +5,6 @@ import "../token/ERC20/ERC20Mintable.sol"; import "../token/ERC20/SafeERC20.sol"; import "../math/Math.sol"; - /** * @title ERC20Migrator * @dev This contract can be used to migrate an ERC20 token from one diff --git a/contracts/drafts/SignatureBouncer.sol b/contracts/drafts/SignatureBouncer.sol index a584b7aad..ff596b006 100644 --- a/contracts/drafts/SignatureBouncer.sol +++ b/contracts/drafts/SignatureBouncer.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../access/roles/SignerRole.sol"; import "../cryptography/ECDSA.sol"; - /** * @title SignatureBouncer * @author PhABC, Shrugs and aflesher diff --git a/contracts/drafts/TokenVesting.sol b/contracts/drafts/TokenVesting.sol index 75b2aaa66..b97b60b2b 100644 --- a/contracts/drafts/TokenVesting.sol +++ b/contracts/drafts/TokenVesting.sol @@ -6,7 +6,6 @@ import "../token/ERC20/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 diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol index 293a9e438..6e1272223 100644 --- a/contracts/examples/SampleCrowdsale.sol +++ b/contracts/examples/SampleCrowdsale.sol @@ -5,7 +5,6 @@ import "../crowdsale/distribution/RefundableCrowdsale.sol"; import "../crowdsale/emission/MintedCrowdsale.sol"; import "../token/ERC20/ERC20Mintable.sol"; - /** * @title SampleCrowdsaleToken * @dev Very simple ERC20 Token that can be minted. @@ -18,7 +17,6 @@ contract SampleCrowdsaleToken is ERC20Mintable { uint8 public constant decimals = 18; } - /** * @title SampleCrowdsale * @dev This is an example of a fully fledged crowdsale. diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol index 67de00ca4..8c63fdd98 100644 --- a/contracts/examples/SimpleToken.sol +++ b/contracts/examples/SimpleToken.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../token/ERC20/ERC20.sol"; - /** * @title SimpleToken * @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator. diff --git a/contracts/introspection/ERC165.sol b/contracts/introspection/ERC165.sol index 849cdf0c1..1af78d111 100644 --- a/contracts/introspection/ERC165.sol +++ b/contracts/introspection/ERC165.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./IERC165.sol"; - /** * @title ERC165 * @author Matt Condon (@shrugs) diff --git a/contracts/introspection/ERC165Checker.sol b/contracts/introspection/ERC165Checker.sol index 36bc20959..3491df904 100644 --- a/contracts/introspection/ERC165Checker.sol +++ b/contracts/introspection/ERC165Checker.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title ERC165Checker * @dev Use `using ERC165Checker for address`; to include this library @@ -16,7 +15,6 @@ library ERC165Checker { * bytes4(keccak256('supportsInterface(bytes4)')) */ - /** * @notice Query if a contract supports ERC165 * @param account The address of the contract to query for support of ERC165 diff --git a/contracts/introspection/IERC165.sol b/contracts/introspection/IERC165.sol index 4d8b5b69f..4e4b7bbf6 100644 --- a/contracts/introspection/IERC165.sol +++ b/contracts/introspection/IERC165.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title IERC165 * @dev https://github.com/ethereum/EIPs/blob/master/EIPS/eip-165.md diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 6d5aec994..5287ecdcb 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/roles/PauserRole.sol"; - /** * @title Pausable * @dev Base contract which allows children to implement an emergency stop mechanism. @@ -13,7 +12,6 @@ contract Pausable is PauserRole { bool private _paused = false; - /** * @return true if the contract is paused, false otherwise. */ diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol index 78ef1ae2b..d51a720c9 100644 --- a/contracts/math/Math.sol +++ b/contracts/math/Math.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Math * @dev Assorted math operations diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol index d183fa361..97494e1f1 100644 --- a/contracts/math/SafeMath.sol +++ b/contracts/math/SafeMath.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title SafeMath * @dev Math operations with safety checks that revert on error diff --git a/contracts/mocks/AddressImpl.sol b/contracts/mocks/AddressImpl.sol index b46fd06c3..e29396056 100644 --- a/contracts/mocks/AddressImpl.sol +++ b/contracts/mocks/AddressImpl.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../utils/Address.sol"; - contract AddressImpl { function isContract(address account) external diff --git a/contracts/mocks/AllowanceCrowdsaleImpl.sol b/contracts/mocks/AllowanceCrowdsaleImpl.sol index be01ccdf9..5b2104e38 100644 --- a/contracts/mocks/AllowanceCrowdsaleImpl.sol +++ b/contracts/mocks/AllowanceCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../crowdsale/emission/AllowanceCrowdsale.sol"; - contract AllowanceCrowdsaleImpl is AllowanceCrowdsale { constructor ( diff --git a/contracts/mocks/CappedCrowdsaleImpl.sol b/contracts/mocks/CappedCrowdsaleImpl.sol index e92cec204..176033b7f 100644 --- a/contracts/mocks/CappedCrowdsaleImpl.sol +++ b/contracts/mocks/CappedCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../crowdsale/validation/CappedCrowdsale.sol"; - contract CappedCrowdsaleImpl is CappedCrowdsale { constructor ( diff --git a/contracts/mocks/CapperRoleMock.sol b/contracts/mocks/CapperRoleMock.sol index 05c15c9dd..118058f39 100644 --- a/contracts/mocks/CapperRoleMock.sol +++ b/contracts/mocks/CapperRoleMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/roles/CapperRole.sol"; - contract CapperRoleMock is CapperRole { function removeCapper(address account) public { _removeCapper(account); diff --git a/contracts/mocks/ConditionalEscrowMock.sol b/contracts/mocks/ConditionalEscrowMock.sol index d3723ad7d..93a594b97 100644 --- a/contracts/mocks/ConditionalEscrowMock.sol +++ b/contracts/mocks/ConditionalEscrowMock.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../payment/ConditionalEscrow.sol"; - // mock class using ConditionalEscrow contract ConditionalEscrowMock is ConditionalEscrow { mapping(address => bool) private _allowed; diff --git a/contracts/mocks/CounterImpl.sol b/contracts/mocks/CounterImpl.sol index d42fcbda2..3c958ba97 100644 --- a/contracts/mocks/CounterImpl.sol +++ b/contracts/mocks/CounterImpl.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../drafts/Counter.sol"; - contract CounterImpl { using Counter for Counter.Counter; diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 082c451be..eea706326 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20Detailed.sol"; - contract ERC20DetailedMock is ERC20, ERC20Detailed { constructor( string name, diff --git a/contracts/mocks/ECDSAMock.sol b/contracts/mocks/ECDSAMock.sol index fa3f22348..9f489069f 100644 --- a/contracts/mocks/ECDSAMock.sol +++ b/contracts/mocks/ECDSAMock.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../cryptography/ECDSA.sol"; - contract ECDSAMock { using ECDSA for bytes32; diff --git a/contracts/mocks/ERC165/ERC165InterfacesSupported.sol b/contracts/mocks/ERC165/ERC165InterfacesSupported.sol index 6573d972c..1a06e9d52 100644 --- a/contracts/mocks/ERC165/ERC165InterfacesSupported.sol +++ b/contracts/mocks/ERC165/ERC165InterfacesSupported.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../../introspection/IERC165.sol"; - /** * https://github.com/ethereum/EIPs/blob/master/EIPS/eip-214.md#specification * > Any attempts to make state-changing operations inside an execution instance with STATIC set to true will instead throw an exception. @@ -56,8 +55,6 @@ contract SupportsInterfaceWithLookupMock is IERC165 { } } - - contract ERC165InterfacesSupported is SupportsInterfaceWithLookupMock { constructor (bytes4[] interfaceIds) public diff --git a/contracts/mocks/ERC165/ERC165NotSupported.sol b/contracts/mocks/ERC165/ERC165NotSupported.sol index 763f8faba..156ef8e8b 100644 --- a/contracts/mocks/ERC165/ERC165NotSupported.sol +++ b/contracts/mocks/ERC165/ERC165NotSupported.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - contract ERC165NotSupported { } diff --git a/contracts/mocks/ERC165CheckerMock.sol b/contracts/mocks/ERC165CheckerMock.sol index f4d6219f9..b0728ba15 100644 --- a/contracts/mocks/ERC165CheckerMock.sol +++ b/contracts/mocks/ERC165CheckerMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../introspection/ERC165Checker.sol"; - contract ERC165CheckerMock { using ERC165Checker for address; diff --git a/contracts/mocks/ERC165Mock.sol b/contracts/mocks/ERC165Mock.sol index cbedcdb74..c42ba62f2 100644 --- a/contracts/mocks/ERC165Mock.sol +++ b/contracts/mocks/ERC165Mock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../introspection/ERC165.sol"; - contract ERC165Mock is ERC165 { function registerInterface(bytes4 interfaceId) public diff --git a/contracts/mocks/ERC20BurnableMock.sol b/contracts/mocks/ERC20BurnableMock.sol index bbc7c4d1a..2c8b3b54a 100644 --- a/contracts/mocks/ERC20BurnableMock.sol +++ b/contracts/mocks/ERC20BurnableMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20Burnable.sol"; - contract ERC20BurnableMock is ERC20Burnable { constructor(address initialAccount, uint256 initialBalance) public { diff --git a/contracts/mocks/ERC20MintableMock.sol b/contracts/mocks/ERC20MintableMock.sol index a2056548f..31384c790 100644 --- a/contracts/mocks/ERC20MintableMock.sol +++ b/contracts/mocks/ERC20MintableMock.sol @@ -3,6 +3,5 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20Mintable.sol"; import "./MinterRoleMock.sol"; - contract ERC20MintableMock is ERC20Mintable, MinterRoleMock { } diff --git a/contracts/mocks/ERC20Mock.sol b/contracts/mocks/ERC20Mock.sol index 046730750..ab0877653 100644 --- a/contracts/mocks/ERC20Mock.sol +++ b/contracts/mocks/ERC20Mock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20.sol"; - // mock class using ERC20 contract ERC20Mock is ERC20 { diff --git a/contracts/mocks/ERC20PausableMock.sol b/contracts/mocks/ERC20PausableMock.sol index c4aa05d06..c6c0fd5ed 100644 --- a/contracts/mocks/ERC20PausableMock.sol +++ b/contracts/mocks/ERC20PausableMock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20Pausable.sol"; import "./PauserRoleMock.sol"; - // mock class using ERC20Pausable contract ERC20PausableMock is ERC20Pausable, PauserRoleMock { diff --git a/contracts/mocks/ERC20WithMetadataMock.sol b/contracts/mocks/ERC20WithMetadataMock.sol index cdc1fe365..ec2d122a1 100644 --- a/contracts/mocks/ERC20WithMetadataMock.sol +++ b/contracts/mocks/ERC20WithMetadataMock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20.sol"; import "../drafts/ERC1046/TokenMetadata.sol"; - contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata { constructor(string tokenURI) public ERC20WithMetadata(tokenURI) diff --git a/contracts/mocks/ERC721FullMock.sol b/contracts/mocks/ERC721FullMock.sol index e3f79b08f..d555b1f83 100644 --- a/contracts/mocks/ERC721FullMock.sol +++ b/contracts/mocks/ERC721FullMock.sol @@ -4,7 +4,6 @@ import "../token/ERC721/ERC721Full.sol"; import "../token/ERC721/ERC721Mintable.sol"; import "../token/ERC721/ERC721Burnable.sol"; - /** * @title ERC721Mock * This mock just provides a public mint and burn functions for testing purposes, diff --git a/contracts/mocks/ERC721MintableBurnableImpl.sol b/contracts/mocks/ERC721MintableBurnableImpl.sol index 4d3c962d8..03ff3ac37 100644 --- a/contracts/mocks/ERC721MintableBurnableImpl.sol +++ b/contracts/mocks/ERC721MintableBurnableImpl.sol @@ -4,7 +4,6 @@ import "../token/ERC721/ERC721Full.sol"; import "../token/ERC721/ERC721Mintable.sol"; import "../token/ERC721/ERC721Burnable.sol"; - /** * @title ERC721MintableBurnableImpl */ diff --git a/contracts/mocks/ERC721Mock.sol b/contracts/mocks/ERC721Mock.sol index 607ceed13..514d3bdbe 100644 --- a/contracts/mocks/ERC721Mock.sol +++ b/contracts/mocks/ERC721Mock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../token/ERC721/ERC721.sol"; - /** * @title ERC721Mock * This mock just provides a public mint and burn functions for testing purposes diff --git a/contracts/mocks/ERC721PausableMock.sol b/contracts/mocks/ERC721PausableMock.sol index 0efcbb925..9751d04cb 100644 --- a/contracts/mocks/ERC721PausableMock.sol +++ b/contracts/mocks/ERC721PausableMock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC721/ERC721Pausable.sol"; import "./PauserRoleMock.sol"; - /** * @title ERC721PausableMock * This mock just provides a public mint, burn and exists functions for testing purposes diff --git a/contracts/mocks/ERC721ReceiverMock.sol b/contracts/mocks/ERC721ReceiverMock.sol index 4e21ff6ac..57fb04e3a 100644 --- a/contracts/mocks/ERC721ReceiverMock.sol +++ b/contracts/mocks/ERC721ReceiverMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../token/ERC721/IERC721Receiver.sol"; - contract ERC721ReceiverMock is IERC721Receiver { bytes4 private _retval; bool private _reverts; diff --git a/contracts/mocks/FinalizableCrowdsaleImpl.sol b/contracts/mocks/FinalizableCrowdsaleImpl.sol index 20076bdd1..084780b1d 100644 --- a/contracts/mocks/FinalizableCrowdsaleImpl.sol +++ b/contracts/mocks/FinalizableCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../crowdsale/distribution/FinalizableCrowdsale.sol"; - contract FinalizableCrowdsaleImpl is FinalizableCrowdsale { constructor ( diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol index 41cde563c..bca5646f3 100644 --- a/contracts/mocks/ForceEther.sol +++ b/contracts/mocks/ForceEther.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - // @title Force Ether into a contract. // @notice even // if the contract is not payable. diff --git a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol index 29d71ec8a..6f1f2e2a0 100644 --- a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol +++ b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../crowdsale/price/IncreasingPriceCrowdsale.sol"; import "../math/SafeMath.sol"; - contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale { constructor ( diff --git a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol index d47600f8d..1bcb95301 100644 --- a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol +++ b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol @@ -4,7 +4,6 @@ import "../token/ERC20/IERC20.sol"; import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol"; import "./CapperRoleMock.sol"; - contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale, CapperRoleMock { diff --git a/contracts/mocks/InsecureInvariantTargetBounty.sol b/contracts/mocks/InsecureInvariantTargetBounty.sol index ded818b1a..cac749d63 100644 --- a/contracts/mocks/InsecureInvariantTargetBounty.sol +++ b/contracts/mocks/InsecureInvariantTargetBounty.sol @@ -5,14 +5,12 @@ pragma solidity ^0.4.24; // solium-disable-next-line max-len import {BreakInvariantBounty, Target} from "../bounties/BreakInvariantBounty.sol"; - contract InsecureInvariantTargetMock is Target { function checkInvariant() public returns(bool) { return false; } } - contract InsecureInvariantTargetBounty is BreakInvariantBounty { function _deployContract() internal returns (address) { return new InsecureInvariantTargetMock(); diff --git a/contracts/mocks/MathMock.sol b/contracts/mocks/MathMock.sol index 696653858..72f7fc204 100644 --- a/contracts/mocks/MathMock.sol +++ b/contracts/mocks/MathMock.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../math/Math.sol"; - contract MathMock { function max(uint256 a, uint256 b) public pure returns (uint256) { return Math.max(a, b); diff --git a/contracts/mocks/MerkleProofWrapper.sol b/contracts/mocks/MerkleProofWrapper.sol index 7909098f6..b359dc790 100644 --- a/contracts/mocks/MerkleProofWrapper.sol +++ b/contracts/mocks/MerkleProofWrapper.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import { MerkleProof } from "../cryptography/MerkleProof.sol"; - contract MerkleProofWrapper { function verify( diff --git a/contracts/mocks/MessageHelper.sol b/contracts/mocks/MessageHelper.sol index 63571714f..54c084414 100644 --- a/contracts/mocks/MessageHelper.sol +++ b/contracts/mocks/MessageHelper.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - contract MessageHelper { event Show(bytes32 b32, uint256 number, string text); diff --git a/contracts/mocks/MintedCrowdsaleImpl.sol b/contracts/mocks/MintedCrowdsaleImpl.sol index afdd3b8c7..518371b75 100644 --- a/contracts/mocks/MintedCrowdsaleImpl.sol +++ b/contracts/mocks/MintedCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20Mintable.sol"; import "../crowdsale/emission/MintedCrowdsale.sol"; - contract MintedCrowdsaleImpl is MintedCrowdsale { constructor ( diff --git a/contracts/mocks/MinterRoleMock.sol b/contracts/mocks/MinterRoleMock.sol index bedf3d45f..45e5a4195 100644 --- a/contracts/mocks/MinterRoleMock.sol +++ b/contracts/mocks/MinterRoleMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/roles/MinterRole.sol"; - contract MinterRoleMock is MinterRole { function removeMinter(address account) public { _removeMinter(account); diff --git a/contracts/mocks/PausableMock.sol b/contracts/mocks/PausableMock.sol index a1c24c087..72ec843ed 100644 --- a/contracts/mocks/PausableMock.sol +++ b/contracts/mocks/PausableMock.sol @@ -1,10 +1,8 @@ pragma solidity ^0.4.24; - import "../lifecycle/Pausable.sol"; import "./PauserRoleMock.sol"; - // mock class using Pausable contract PausableMock is Pausable, PauserRoleMock { bool public drasticMeasureTaken; diff --git a/contracts/mocks/PauserRoleMock.sol b/contracts/mocks/PauserRoleMock.sol index df0213326..267101e4a 100644 --- a/contracts/mocks/PauserRoleMock.sol +++ b/contracts/mocks/PauserRoleMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/roles/PauserRole.sol"; - contract PauserRoleMock is PauserRole { function removePauser(address account) public { _removePauser(account); diff --git a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol index c6dca89a5..98d056c66 100644 --- a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol +++ b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../crowdsale/distribution/PostDeliveryCrowdsale.sol"; - contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale { constructor ( diff --git a/contracts/mocks/PullPaymentMock.sol b/contracts/mocks/PullPaymentMock.sol index d6da3ed70..63076c904 100644 --- a/contracts/mocks/PullPaymentMock.sol +++ b/contracts/mocks/PullPaymentMock.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../payment/PullPayment.sol"; - // mock class using PullPayment contract PullPaymentMock is PullPayment { diff --git a/contracts/mocks/ReentrancyAttack.sol b/contracts/mocks/ReentrancyAttack.sol index 05ef748e7..96231de27 100644 --- a/contracts/mocks/ReentrancyAttack.sol +++ b/contracts/mocks/ReentrancyAttack.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - contract ReentrancyAttack { function callSender(bytes4 data) public { diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol index 130a8fd90..474ecd433 100644 --- a/contracts/mocks/ReentrancyMock.sol +++ b/contracts/mocks/ReentrancyMock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../utils/ReentrancyGuard.sol"; import "./ReentrancyAttack.sol"; - contract ReentrancyMock is ReentrancyGuard { uint256 public counter; diff --git a/contracts/mocks/RefundableCrowdsaleImpl.sol b/contracts/mocks/RefundableCrowdsaleImpl.sol index 631f29d04..a14dfbcb3 100644 --- a/contracts/mocks/RefundableCrowdsaleImpl.sol +++ b/contracts/mocks/RefundableCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/ERC20Mintable.sol"; import "../crowdsale/distribution/RefundableCrowdsale.sol"; - contract RefundableCrowdsaleImpl is RefundableCrowdsale { constructor ( diff --git a/contracts/mocks/RolesMock.sol b/contracts/mocks/RolesMock.sol index cd2922289..bfcee20ee 100644 --- a/contracts/mocks/RolesMock.sol +++ b/contracts/mocks/RolesMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/Roles.sol"; - contract RolesMock { using Roles for Roles.Role; diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol index 0009fd01c..c80c762d9 100644 --- a/contracts/mocks/SafeERC20Helper.sol +++ b/contracts/mocks/SafeERC20Helper.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../token/ERC20/SafeERC20.sol"; - contract ERC20FailingMock is IERC20 { function totalSupply() public view returns (uint256) { return 0; @@ -30,7 +29,6 @@ contract ERC20FailingMock is IERC20 { } } - contract ERC20SucceedingMock is IERC20 { function totalSupply() public view returns (uint256) { return 0; @@ -57,7 +55,6 @@ contract ERC20SucceedingMock is IERC20 { } } - contract SafeERC20Helper { using SafeERC20 for IERC20; diff --git a/contracts/mocks/SafeMathMock.sol b/contracts/mocks/SafeMathMock.sol index c5464ec16..7ddf17e9f 100644 --- a/contracts/mocks/SafeMathMock.sol +++ b/contracts/mocks/SafeMathMock.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.24; - import "../math/SafeMath.sol"; - contract SafeMathMock { function mul(uint256 a, uint256 b) public pure returns (uint256) { diff --git a/contracts/mocks/SecondaryMock.sol b/contracts/mocks/SecondaryMock.sol index 6863112fa..268c12516 100644 --- a/contracts/mocks/SecondaryMock.sol +++ b/contracts/mocks/SecondaryMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../ownership/Secondary.sol"; - contract SecondaryMock is Secondary { function onlyPrimaryMock() public view onlyPrimary { } diff --git a/contracts/mocks/SecureInvariantTargetBounty.sol b/contracts/mocks/SecureInvariantTargetBounty.sol index 40f2de994..9f2525bf0 100644 --- a/contracts/mocks/SecureInvariantTargetBounty.sol +++ b/contracts/mocks/SecureInvariantTargetBounty.sol @@ -5,14 +5,12 @@ pragma solidity ^0.4.24; // solium-disable-next-line max-len import {BreakInvariantBounty, Target} from "../bounties/BreakInvariantBounty.sol"; - contract SecureInvariantTargetMock is Target { function checkInvariant() public returns(bool) { return true; } } - contract SecureInvariantTargetBounty is BreakInvariantBounty { function _deployContract() internal returns (address) { return new SecureInvariantTargetMock(); diff --git a/contracts/mocks/SignatureBouncerMock.sol b/contracts/mocks/SignatureBouncerMock.sol index 1ac00bfa2..ad9494033 100644 --- a/contracts/mocks/SignatureBouncerMock.sol +++ b/contracts/mocks/SignatureBouncerMock.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../drafts/SignatureBouncer.sol"; import "./SignerRoleMock.sol"; - contract SignatureBouncerMock is SignatureBouncer, SignerRoleMock { function checkValidSignature(address account, bytes signature) public diff --git a/contracts/mocks/SignerRoleMock.sol b/contracts/mocks/SignerRoleMock.sol index ba71cdeaa..faf92db68 100644 --- a/contracts/mocks/SignerRoleMock.sol +++ b/contracts/mocks/SignerRoleMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../access/roles/SignerRole.sol"; - contract SignerRoleMock is SignerRole { function removeSigner(address account) public { _removeSigner(account); diff --git a/contracts/mocks/TimedCrowdsaleImpl.sol b/contracts/mocks/TimedCrowdsaleImpl.sol index 296484ed1..f16e5eb2a 100644 --- a/contracts/mocks/TimedCrowdsaleImpl.sol +++ b/contracts/mocks/TimedCrowdsaleImpl.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../token/ERC20/IERC20.sol"; import "../crowdsale/validation/TimedCrowdsale.sol"; - contract TimedCrowdsaleImpl is TimedCrowdsale { constructor ( diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index e7d2810de..d8ede5cd2 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Ownable * @dev The Ownable contract has an owner address, and provides basic authorization control @@ -9,14 +8,12 @@ pragma solidity ^0.4.24; contract Ownable { address private _owner; - event OwnershipRenounced(address indexed previousOwner); event OwnershipTransferred( address indexed previousOwner, address indexed newOwner ); - /** * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. diff --git a/contracts/ownership/Secondary.sol b/contracts/ownership/Secondary.sol index 055db51d5..d602d67ec 100644 --- a/contracts/ownership/Secondary.sol +++ b/contracts/ownership/Secondary.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Secondary * @dev A Secondary contract can only be used by its primary account (the one that created it) diff --git a/contracts/payment/ConditionalEscrow.sol b/contracts/payment/ConditionalEscrow.sol index 933243a25..645dad479 100644 --- a/contracts/payment/ConditionalEscrow.sol +++ b/contracts/payment/ConditionalEscrow.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./Escrow.sol"; - /** * @title ConditionalEscrow * @dev Base abstract escrow to only allow withdrawal if a condition is met. diff --git a/contracts/payment/Escrow.sol b/contracts/payment/Escrow.sol index 2e6c5565a..21f7d6edd 100644 --- a/contracts/payment/Escrow.sol +++ b/contracts/payment/Escrow.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "../math/SafeMath.sol"; import "../ownership/Secondary.sol"; - /** * @title Escrow * @dev Base escrow contract, holds funds destinated to a payee until they diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol index 8399fa4e1..67ef8c667 100644 --- a/contracts/payment/PullPayment.sol +++ b/contracts/payment/PullPayment.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./Escrow.sol"; - /** * @title PullPayment * @dev Base contract supporting async send for pull payments. Inherit from this diff --git a/contracts/payment/RefundEscrow.sol b/contracts/payment/RefundEscrow.sol index ae7f9c463..3eca6bbcf 100644 --- a/contracts/payment/RefundEscrow.sol +++ b/contracts/payment/RefundEscrow.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ConditionalEscrow.sol"; import "../ownership/Secondary.sol"; - /** * @title RefundEscrow * @dev Escrow that holds funds for a beneficiary, deposited from multiple parties. diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index 19df9b706..e0e057ae8 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../math/SafeMath.sol"; - /** * @title SplitPayment * @dev This contract can be used when payments need to be received by a group diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol index 34cb3f6ce..8fd420a29 100644 --- a/contracts/token/ERC20/ERC20.sol +++ b/contracts/token/ERC20/ERC20.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./IERC20.sol"; import "../../math/SafeMath.sol"; - /** * @title Standard ERC20 token * diff --git a/contracts/token/ERC20/ERC20Burnable.sol b/contracts/token/ERC20/ERC20Burnable.sol index e49d5de2c..014dc7fa8 100644 --- a/contracts/token/ERC20/ERC20Burnable.sol +++ b/contracts/token/ERC20/ERC20Burnable.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./ERC20.sol"; - /** * @title Burnable Token * @dev Token that can be irreversibly burned (destroyed). diff --git a/contracts/token/ERC20/ERC20Capped.sol b/contracts/token/ERC20/ERC20Capped.sol index 1222034cd..0a73159b6 100644 --- a/contracts/token/ERC20/ERC20Capped.sol +++ b/contracts/token/ERC20/ERC20Capped.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./ERC20Mintable.sol"; - /** * @title Capped token * @dev Mintable token with a token cap. diff --git a/contracts/token/ERC20/ERC20Detailed.sol b/contracts/token/ERC20/ERC20Detailed.sol index ba411aa1f..706dbfc46 100644 --- a/contracts/token/ERC20/ERC20Detailed.sol +++ b/contracts/token/ERC20/ERC20Detailed.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./IERC20.sol"; - /** * @title ERC20Detailed token * @dev The decimals are only for visualization purposes. diff --git a/contracts/token/ERC20/ERC20Mintable.sol b/contracts/token/ERC20/ERC20Mintable.sol index 20cc200ed..d6bd9b5ea 100644 --- a/contracts/token/ERC20/ERC20Mintable.sol +++ b/contracts/token/ERC20/ERC20Mintable.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ERC20.sol"; import "../../access/roles/MinterRole.sol"; - /** * @title ERC20Mintable * @dev ERC20 minting logic diff --git a/contracts/token/ERC20/ERC20Pausable.sol b/contracts/token/ERC20/ERC20Pausable.sol index 32932355d..8e6aa881f 100644 --- a/contracts/token/ERC20/ERC20Pausable.sol +++ b/contracts/token/ERC20/ERC20Pausable.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ERC20.sol"; import "../../lifecycle/Pausable.sol"; - /** * @title Pausable token * @dev ERC20 modified with pausable transfers. diff --git a/contracts/token/ERC20/IERC20.sol b/contracts/token/ERC20/IERC20.sol index 34d68fd62..37e5a447c 100644 --- a/contracts/token/ERC20/IERC20.sol +++ b/contracts/token/ERC20/IERC20.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title ERC20 interface * @dev see https://github.com/ethereum/EIPs/issues/20 diff --git a/contracts/token/ERC20/SafeERC20.sol b/contracts/token/ERC20/SafeERC20.sol index 48b15fba9..10c6ff2bc 100644 --- a/contracts/token/ERC20/SafeERC20.sol +++ b/contracts/token/ERC20/SafeERC20.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ERC20.sol"; import "./IERC20.sol"; - /** * @title SafeERC20 * @dev Wrappers around ERC20 operations that throw on failure. diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 9989ce77a..55903482b 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./SafeERC20.sol"; - /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol index 7501248d7..eeee146e2 100644 --- a/contracts/token/ERC721/ERC721.sol +++ b/contracts/token/ERC721/ERC721.sol @@ -6,7 +6,6 @@ import "../../math/SafeMath.sol"; import "../../utils/Address.sol"; import "../../introspection/ERC165.sol"; - /** * @title ERC721 Non-Fungible Token Standard basic implementation * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md diff --git a/contracts/token/ERC721/ERC721Burnable.sol b/contracts/token/ERC721/ERC721Burnable.sol index 3195cd424..3fc0277e5 100644 --- a/contracts/token/ERC721/ERC721Burnable.sol +++ b/contracts/token/ERC721/ERC721Burnable.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./ERC721.sol"; - contract ERC721Burnable is ERC721 { function burn(uint256 tokenId) public diff --git a/contracts/token/ERC721/ERC721Enumerable.sol b/contracts/token/ERC721/ERC721Enumerable.sol index a4cceed20..0a2797eed 100644 --- a/contracts/token/ERC721/ERC721Enumerable.sol +++ b/contracts/token/ERC721/ERC721Enumerable.sol @@ -4,7 +4,6 @@ import "./IERC721Enumerable.sol"; import "./ERC721.sol"; import "../../introspection/ERC165.sol"; - contract ERC721Enumerable is ERC165, ERC721, IERC721Enumerable { // Mapping from owner to list of owned token IDs mapping(address => uint256[]) private _ownedTokens; diff --git a/contracts/token/ERC721/ERC721Full.sol b/contracts/token/ERC721/ERC721Full.sol index 6492a8ca1..293637501 100644 --- a/contracts/token/ERC721/ERC721Full.sol +++ b/contracts/token/ERC721/ERC721Full.sol @@ -4,7 +4,6 @@ import "./ERC721.sol"; import "./ERC721Enumerable.sol"; import "./ERC721Metadata.sol"; - /** * @title Full ERC721 Token * This implementation includes all the required and some optional functionality of the ERC721 standard diff --git a/contracts/token/ERC721/ERC721Holder.sol b/contracts/token/ERC721/ERC721Holder.sol index 67048598f..cf0e9ce55 100644 --- a/contracts/token/ERC721/ERC721Holder.sol +++ b/contracts/token/ERC721/ERC721Holder.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./IERC721Receiver.sol"; - contract ERC721Holder is IERC721Receiver { function onERC721Received( address, diff --git a/contracts/token/ERC721/ERC721Metadata.sol b/contracts/token/ERC721/ERC721Metadata.sol index b4f1da3ab..8334160aa 100644 --- a/contracts/token/ERC721/ERC721Metadata.sol +++ b/contracts/token/ERC721/ERC721Metadata.sol @@ -4,7 +4,6 @@ import "./ERC721.sol"; import "./IERC721Metadata.sol"; import "../../introspection/ERC165.sol"; - contract ERC721Metadata is ERC165, ERC721, IERC721Metadata { // Token name string internal _name; diff --git a/contracts/token/ERC721/ERC721Mintable.sol b/contracts/token/ERC721/ERC721Mintable.sol index 39fb9761d..f7cd0e9f9 100644 --- a/contracts/token/ERC721/ERC721Mintable.sol +++ b/contracts/token/ERC721/ERC721Mintable.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ERC721Full.sol"; import "../../access/roles/MinterRole.sol"; - /** * @title ERC721Mintable * @dev ERC721 minting logic diff --git a/contracts/token/ERC721/ERC721Pausable.sol b/contracts/token/ERC721/ERC721Pausable.sol index c0cca9dcf..c66d9da1f 100644 --- a/contracts/token/ERC721/ERC721Pausable.sol +++ b/contracts/token/ERC721/ERC721Pausable.sol @@ -3,7 +3,6 @@ pragma solidity ^0.4.24; import "./ERC721.sol"; import "../../lifecycle/Pausable.sol"; - /** * @title ERC721 Non-Fungible Pausable token * @dev ERC721 modified with pausable transfers. diff --git a/contracts/token/ERC721/IERC721.sol b/contracts/token/ERC721/IERC721.sol index 1d4ac1de4..24bc6a242 100644 --- a/contracts/token/ERC721/IERC721.sol +++ b/contracts/token/ERC721/IERC721.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "../../introspection/IERC165.sol"; - /** * @title ERC721 Non-Fungible Token Standard basic interface * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md diff --git a/contracts/token/ERC721/IERC721Enumerable.sol b/contracts/token/ERC721/IERC721Enumerable.sol index b848b7b69..b772f2507 100644 --- a/contracts/token/ERC721/IERC721Enumerable.sol +++ b/contracts/token/ERC721/IERC721Enumerable.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./IERC721.sol"; - /** * @title ERC-721 Non-Fungible Token Standard, optional enumeration extension * @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md diff --git a/contracts/token/ERC721/IERC721Full.sol b/contracts/token/ERC721/IERC721Full.sol index 10914dc23..90d8c21d8 100644 --- a/contracts/token/ERC721/IERC721Full.sol +++ b/contracts/token/ERC721/IERC721Full.sol @@ -4,7 +4,6 @@ import "./IERC721.sol"; import "./IERC721Enumerable.sol"; import "./IERC721Metadata.sol"; - /** * @title ERC-721 Non-Fungible Token Standard, full implementation interface * @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md diff --git a/contracts/token/ERC721/IERC721Metadata.sol b/contracts/token/ERC721/IERC721Metadata.sol index ed7ab29d9..2e1521208 100644 --- a/contracts/token/ERC721/IERC721Metadata.sol +++ b/contracts/token/ERC721/IERC721Metadata.sol @@ -2,7 +2,6 @@ pragma solidity ^0.4.24; import "./IERC721.sol"; - /** * @title ERC-721 Non-Fungible Token Standard, optional metadata extension * @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md diff --git a/contracts/token/ERC721/IERC721Receiver.sol b/contracts/token/ERC721/IERC721Receiver.sol index 946582f7e..e692f7e2c 100644 --- a/contracts/token/ERC721/IERC721Receiver.sol +++ b/contracts/token/ERC721/IERC721Receiver.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title ERC721 token receiver interface * @dev Interface for any contract that wants to support safeTransfers diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol index 1f27c93f1..92a43ff9c 100644 --- a/contracts/utils/Address.sol +++ b/contracts/utils/Address.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * Utility library of inline functions on addresses */ diff --git a/contracts/utils/ReentrancyGuard.sol b/contracts/utils/ReentrancyGuard.sol index 7f232cce5..63da3a99e 100644 --- a/contracts/utils/ReentrancyGuard.sol +++ b/contracts/utils/ReentrancyGuard.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.24; - /** * @title Helps contracts guard against reentrancy attacks. * @author Remco Bloemen , Eenae