Commit ad123815 by John Shutt Committed by Matt Condon

update constructor syntax for solidity 0.4.23 in numerous contracts (#921)

* update solidity-coverage to ^0.5.0

* update truffle dependency to ^4.1.8

* update solium to ^1.1.7

* update all contracts to solidity ^0.4.23
parent 20b85be6
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./payment/PullPayment.sol"; import "./payment/PullPayment.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
...@@ -16,7 +16,7 @@ contract DayLimit { ...@@ -16,7 +16,7 @@ contract DayLimit {
* @dev Constructor that sets the passed value as a dailyLimit. * @dev Constructor that sets the passed value as a dailyLimit.
* @param _limit uint256 to represent the daily limit. * @param _limit uint256 to represent the daily limit.
*/ */
function DayLimit(uint256 _limit) public { constructor(uint256 _limit) public {
dailyLimit = _limit; dailyLimit = _limit;
lastDay = today(); lastDay = today();
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
...@@ -15,7 +15,7 @@ contract LimitBalance { ...@@ -15,7 +15,7 @@ contract LimitBalance {
* @dev Constructor that sets the passed value as a limit. * @dev Constructor that sets the passed value as a limit.
* @param _limit uint256 to represent the limit. * @param _limit uint256 to represent the limit.
*/ */
function LimitBalance(uint256 _limit) public { constructor(uint256 _limit) public {
limit = _limit; limit = _limit;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/* /*
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.18; pragma solidity ^0.4.23;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../ownership/rbac/RBAC.sol"; import "../ownership/rbac/RBAC.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
...@@ -45,7 +45,7 @@ contract Crowdsale { ...@@ -45,7 +45,7 @@ contract Crowdsale {
* @param _wallet Address where collected funds will be forwarded to * @param _wallet Address where collected funds will be forwarded to
* @param _token Address of the token being sold * @param _token Address of the token being sold
*/ */
function Crowdsale(uint256 _rate, address _wallet, ERC20 _token) public { constructor(uint256 _rate, address _wallet, ERC20 _token) public {
require(_rate > 0); require(_rate > 0);
require(_wallet != address(0)); require(_wallet != address(0));
require(_token != address(0)); require(_token != address(0));
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../validation/TimedCrowdsale.sol"; import "../validation/TimedCrowdsale.sol";
import "../../token/ERC20/ERC20.sol"; import "../../token/ERC20/ERC20.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
...@@ -25,7 +25,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale { ...@@ -25,7 +25,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
* @dev Constructor, creates RefundVault. * @dev Constructor, creates RefundVault.
* @param _goal Funding goal * @param _goal Funding goal
*/ */
function RefundableCrowdsale(uint256 _goal) public { constructor(uint256 _goal) public {
require(_goal > 0); require(_goal > 0);
vault = new RefundVault(wallet); vault = new RefundVault(wallet);
goal = _goal; goal = _goal;
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../../math/SafeMath.sol"; import "../../../math/SafeMath.sol";
import "../../../ownership/Ownable.sol"; import "../../../ownership/Ownable.sol";
...@@ -26,7 +26,7 @@ contract RefundVault is Ownable { ...@@ -26,7 +26,7 @@ contract RefundVault is Ownable {
/** /**
* @param _wallet Vault address * @param _wallet Vault address
*/ */
function RefundVault(address _wallet) public { constructor(address _wallet) public {
require(_wallet != address(0)); require(_wallet != address(0));
wallet = _wallet; wallet = _wallet;
state = State.Active; state = State.Active;
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../token/ERC20/ERC20.sol"; import "../../token/ERC20/ERC20.sol";
...@@ -15,10 +15,10 @@ contract AllowanceCrowdsale is Crowdsale { ...@@ -15,10 +15,10 @@ contract AllowanceCrowdsale is Crowdsale {
address public tokenWallet; address public tokenWallet;
/** /**
* @dev Constructor, takes token wallet address. * @dev Constructor, takes token wallet address.
* @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale * @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale
*/ */
function AllowanceCrowdsale(address _tokenWallet) public { constructor(address _tokenWallet) public {
require(_tokenWallet != address(0)); require(_tokenWallet != address(0));
tokenWallet = _tokenWallet; tokenWallet = _tokenWallet;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../token/ERC20/MintableToken.sol"; import "../../token/ERC20/MintableToken.sol";
...@@ -7,7 +7,7 @@ import "../../token/ERC20/MintableToken.sol"; ...@@ -7,7 +7,7 @@ import "../../token/ERC20/MintableToken.sol";
/** /**
* @title MintedCrowdsale * @title MintedCrowdsale
* @dev Extension of Crowdsale contract whose tokens are minted in each purchase. * @dev Extension of Crowdsale contract whose tokens are minted in each purchase.
* Token ownership should be transferred to MintedCrowdsale for minting. * Token ownership should be transferred to MintedCrowdsale for minting.
*/ */
contract MintedCrowdsale is Crowdsale { contract MintedCrowdsale is Crowdsale {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../validation/TimedCrowdsale.sol"; import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
...@@ -21,7 +21,7 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale { ...@@ -21,7 +21,7 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale {
* @param _initialRate Number of tokens a buyer gets per wei at the start of the crowdsale * @param _initialRate Number of tokens a buyer gets per wei at the start of the crowdsale
* @param _finalRate Number of tokens a buyer gets per wei at the end of the crowdsale * @param _finalRate Number of tokens a buyer gets per wei at the end of the crowdsale
*/ */
function IncreasingPriceCrowdsale(uint256 _initialRate, uint256 _finalRate) public { constructor(uint256 _initialRate, uint256 _finalRate) public {
require(_initialRate >= _finalRate); require(_initialRate >= _finalRate);
require(_finalRate > 0); require(_finalRate > 0);
initialRate = _initialRate; initialRate = _initialRate;
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
...@@ -17,13 +17,13 @@ contract CappedCrowdsale is Crowdsale { ...@@ -17,13 +17,13 @@ contract CappedCrowdsale is Crowdsale {
* @dev Constructor, takes maximum amount of wei accepted in the crowdsale. * @dev Constructor, takes maximum amount of wei accepted in the crowdsale.
* @param _cap Max amount of wei to be contributed * @param _cap Max amount of wei to be contributed
*/ */
function CappedCrowdsale(uint256 _cap) public { constructor(uint256 _cap) public {
require(_cap > 0); require(_cap > 0);
cap = _cap; cap = _cap;
} }
/** /**
* @dev Checks whether the cap has been reached. * @dev Checks whether the cap has been reached.
* @return Whether the cap was reached * @return Whether the cap was reached
*/ */
function capReached() public view returns (bool) { function capReached() public view returns (bool) {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
...@@ -28,7 +28,7 @@ contract TimedCrowdsale is Crowdsale { ...@@ -28,7 +28,7 @@ contract TimedCrowdsale is Crowdsale {
* @param _openingTime Crowdsale opening time * @param _openingTime Crowdsale opening time
* @param _closingTime Crowdsale closing time * @param _closingTime Crowdsale closing time
*/ */
function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public { constructor(uint256 _openingTime, uint256 _closingTime) public {
// solium-disable-next-line security/no-block-members // solium-disable-next-line security/no-block-members
require(_openingTime >= block.timestamp); require(_openingTime >= block.timestamp);
require(_closingTime >= _openingTime); require(_closingTime >= _openingTime);
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../crowdsale/validation/CappedCrowdsale.sol"; import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol"; import "../crowdsale/distribution/RefundableCrowdsale.sol";
...@@ -33,7 +33,7 @@ contract SampleCrowdsaleToken is MintableToken { ...@@ -33,7 +33,7 @@ contract SampleCrowdsaleToken is MintableToken {
*/ */
contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale { contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale {
function SampleCrowdsale( constructor(
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
uint256 _rate, uint256 _rate,
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/Heritable.sol"; import "../ownership/Heritable.sol";
...@@ -19,7 +19,7 @@ contract SimpleSavingsWallet is Heritable { ...@@ -19,7 +19,7 @@ contract SimpleSavingsWallet is Heritable {
event Received(address indexed payer, uint256 amount, uint256 balance); event Received(address indexed payer, uint256 amount, uint256 balance);
function SimpleSavingsWallet(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {} constructor(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {}
/** /**
* @dev wallet can receive funds. * @dev wallet can receive funds.
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol"; import "../token/ERC20/StandardToken.sol";
...@@ -21,7 +21,7 @@ contract SimpleToken is StandardToken { ...@@ -21,7 +21,7 @@ contract SimpleToken is StandardToken {
/** /**
* @dev Constructor that gives msg.sender all of existing tokens. * @dev Constructor that gives msg.sender all of existing tokens.
*/ */
function SimpleToken() public { constructor() public {
totalSupply_ = INITIAL_SUPPLY; totalSupply_ = INITIAL_SUPPLY;
balances[msg.sender] = INITIAL_SUPPLY; balances[msg.sender] = INITIAL_SUPPLY;
emit Transfer(0x0, msg.sender, INITIAL_SUPPLY); emit Transfer(0x0, msg.sender, INITIAL_SUPPLY);
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
...@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol"; ...@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
*/ */
contract Destructible is Ownable { contract Destructible is Ownable {
function Destructible() public payable { } constructor() public payable { }
/** /**
* @dev Transfers the current balance to the owner and terminates the contract. * @dev Transfers the current balance to the owner and terminates the contract.
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../token/ERC20/ERC20Basic.sol"; import "../token/ERC20/ERC20Basic.sol";
...@@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Basic.sol"; ...@@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Basic.sol";
*/ */
contract TokenDestructible is Ownable { contract TokenDestructible is Ownable {
function TokenDestructible() public payable { } constructor() public payable { }
/** /**
* @notice Terminate contract and refund to owner * @notice Terminate contract and refund to owner
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/emission/AllowanceCrowdsale.sol"; import "../crowdsale/emission/AllowanceCrowdsale.sol";
...@@ -6,12 +6,12 @@ import "../crowdsale/emission/AllowanceCrowdsale.sol"; ...@@ -6,12 +6,12 @@ import "../crowdsale/emission/AllowanceCrowdsale.sol";
contract AllowanceCrowdsaleImpl is AllowanceCrowdsale { contract AllowanceCrowdsaleImpl is AllowanceCrowdsale {
function AllowanceCrowdsaleImpl ( constructor (
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
ERC20 _token, ERC20 _token,
address _tokenWallet address _tokenWallet
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
AllowanceCrowdsale(_tokenWallet) AllowanceCrowdsale(_tokenWallet)
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/BasicToken.sol"; import "../token/ERC20/BasicToken.sol";
...@@ -7,7 +7,7 @@ import "../token/ERC20/BasicToken.sol"; ...@@ -7,7 +7,7 @@ import "../token/ERC20/BasicToken.sol";
// mock class using BasicToken // mock class using BasicToken
contract BasicTokenMock is BasicToken { contract BasicTokenMock is BasicToken {
function BasicTokenMock(address initialAccount, uint256 initialBalance) public { constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.18; pragma solidity ^0.4.23;
import "../access/SignatureBouncer.sol"; import "../access/SignatureBouncer.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/BurnableToken.sol"; import "../token/ERC20/BurnableToken.sol";
contract BurnableTokenMock is BurnableToken { contract BurnableTokenMock is BurnableToken {
function BurnableTokenMock(address initialAccount, uint initialBalance) public { constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/CappedCrowdsale.sol"; import "../crowdsale/validation/CappedCrowdsale.sol";
...@@ -6,12 +6,12 @@ import "../crowdsale/validation/CappedCrowdsale.sol"; ...@@ -6,12 +6,12 @@ import "../crowdsale/validation/CappedCrowdsale.sol";
contract CappedCrowdsaleImpl is CappedCrowdsale { contract CappedCrowdsaleImpl is CappedCrowdsale {
function CappedCrowdsaleImpl ( constructor (
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
ERC20 _token, ERC20 _token,
uint256 _cap uint256 _cap
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
CappedCrowdsale(_cap) CappedCrowdsale(_cap)
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../contracts/DayLimit.sol"; import "../../contracts/DayLimit.sol";
...@@ -6,7 +6,7 @@ import "../../contracts/DayLimit.sol"; ...@@ -6,7 +6,7 @@ import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit { contract DayLimitMock is DayLimit {
uint256 public totalSpending; uint256 public totalSpending;
function DayLimitMock(uint256 _value) public DayLimit(_value) { constructor(uint256 _value) public DayLimit(_value) {
totalSpending = 0; totalSpending = 0;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol"; import "../token/ERC20/StandardToken.sol";
import "../token/ERC20/DetailedERC20.sol"; import "../token/ERC20/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 { contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {} constructor(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
} }
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ECRecovery.sol"; import "../ECRecovery.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/BasicToken.sol"; import "../token/ERC20/BasicToken.sol";
...@@ -10,7 +10,7 @@ contract ERC223ContractInterface { ...@@ -10,7 +10,7 @@ contract ERC223ContractInterface {
contract ERC223TokenMock is BasicToken { contract ERC223TokenMock is BasicToken {
function ERC223TokenMock(address initialAccount, uint256 initialBalance) public { constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC721/ERC721BasicToken.sol"; import "../token/ERC721/ERC721BasicToken.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC721/ERC721Receiver.sol"; import "../token/ERC721/ERC721Receiver.sol";
...@@ -9,7 +9,7 @@ contract ERC721ReceiverMock is ERC721Receiver { ...@@ -9,7 +9,7 @@ contract ERC721ReceiverMock is ERC721Receiver {
event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas); event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas);
function ERC721ReceiverMock(bytes4 _retval, bool _reverts) public { constructor(bytes4 _retval, bool _reverts) public {
retval = _retval; retval = _retval;
reverts = _reverts; reverts = _reverts;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC721/ERC721Token.sol"; import "../token/ERC721/ERC721Token.sol";
...@@ -9,7 +9,7 @@ import "../token/ERC721/ERC721Token.sol"; ...@@ -9,7 +9,7 @@ import "../token/ERC721/ERC721Token.sol";
* and a public setter for metadata URI * and a public setter for metadata URI
*/ */
contract ERC721TokenMock is ERC721Token { contract ERC721TokenMock is ERC721Token {
function ERC721TokenMock(string name, string symbol) public constructor(string name, string symbol) public
ERC721Token(name, symbol) ERC721Token(name, symbol)
{ } { }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC827/ERC827Token.sol"; import "../token/ERC827/ERC827Token.sol";
...@@ -7,7 +7,7 @@ import "../token/ERC827/ERC827Token.sol"; ...@@ -7,7 +7,7 @@ import "../token/ERC827/ERC827Token.sol";
// mock class using ERC827 Token // mock class using ERC827 Token
contract ERC827TokenMock is ERC827Token { contract ERC827TokenMock is ERC827Token {
function ERC827TokenMock(address initialAccount, uint256 initialBalance) public { constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol"; import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/FinalizableCrowdsale.sol"; import "../crowdsale/distribution/FinalizableCrowdsale.sol";
...@@ -6,13 +6,13 @@ import "../crowdsale/distribution/FinalizableCrowdsale.sol"; ...@@ -6,13 +6,13 @@ import "../crowdsale/distribution/FinalizableCrowdsale.sol";
contract FinalizableCrowdsaleImpl is FinalizableCrowdsale { contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
function FinalizableCrowdsaleImpl ( constructor (
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
MintableToken _token MintableToken _token
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
TimedCrowdsale(_openingTime, _closingTime) TimedCrowdsale(_openingTime, _closingTime)
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
// @title Force Ether into a contract. // @title Force Ether into a contract.
...@@ -8,7 +8,7 @@ pragma solidity ^0.4.21; ...@@ -8,7 +8,7 @@ pragma solidity ^0.4.21;
// @author Remco Bloemen <remco@neufund.org> // @author Remco Bloemen <remco@neufund.org>
contract ForceEther { contract ForceEther {
function ForceEther() public payable { } constructor() public payable { }
function destroyAndSend(address _recipient) public { function destroyAndSend(address _recipient) public {
selfdestruct(_recipient); selfdestruct(_recipient);
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../contracts/ownership/HasNoEther.sol"; import "../../contracts/ownership/HasNoEther.sol";
...@@ -6,7 +6,7 @@ import "../../contracts/ownership/HasNoEther.sol"; ...@@ -6,7 +6,7 @@ import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther { contract HasNoEtherTest is HasNoEther {
// Constructor with explicit payable — should still fail // Constructor with explicit payable — should still fail
function HasNoEtherTest() public payable { constructor() public payable {
} }
} }
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../crowdsale/price/IncreasingPriceCrowdsale.sol"; import "../crowdsale/price/IncreasingPriceCrowdsale.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
...@@ -6,14 +6,14 @@ import "../math/SafeMath.sol"; ...@@ -6,14 +6,14 @@ import "../math/SafeMath.sol";
contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale { contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale {
function IncreasingPriceCrowdsaleImpl ( constructor (
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
address _wallet, address _wallet,
ERC20 _token, ERC20 _token,
uint256 _initialRate, uint256 _initialRate,
uint256 _finalRate uint256 _finalRate
) )
public public
Crowdsale(_initialRate, _wallet, _token) Crowdsale(_initialRate, _wallet, _token)
TimedCrowdsale(_openingTime, _closingTime) TimedCrowdsale(_openingTime, _closingTime)
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol"; import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";
contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale { contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale {
function IndividuallyCappedCrowdsaleImpl ( constructor (
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
ERC20 _token ERC20 _token
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
{ {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import {Bounty, Target} from "../../contracts/Bounty.sol"; import {Bounty, Target} from "../../contracts/Bounty.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../LimitBalance.sol"; import "../LimitBalance.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../../contracts/math/Math.sol"; import "../../contracts/math/Math.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import { MerkleProof } from "../MerkleProof.sol"; import { MerkleProof } from "../MerkleProof.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
contract MessageHelper { contract MessageHelper {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol"; import "../token/ERC20/MintableToken.sol";
import "../crowdsale/emission/MintedCrowdsale.sol"; import "../crowdsale/emission/MintedCrowdsale.sol";
...@@ -6,11 +6,11 @@ import "../crowdsale/emission/MintedCrowdsale.sol"; ...@@ -6,11 +6,11 @@ import "../crowdsale/emission/MintedCrowdsale.sol";
contract MintedCrowdsaleImpl is MintedCrowdsale { contract MintedCrowdsaleImpl is MintedCrowdsale {
function MintedCrowdsaleImpl ( constructor (
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
MintableToken _token MintableToken _token
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
{ {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../lifecycle/Pausable.sol"; import "../lifecycle/Pausable.sol";
...@@ -9,7 +9,7 @@ contract PausableMock is Pausable { ...@@ -9,7 +9,7 @@ contract PausableMock is Pausable {
bool public drasticMeasureTaken; bool public drasticMeasureTaken;
uint256 public count; uint256 public count;
function PausableMock() public { constructor() public {
drasticMeasureTaken = false; drasticMeasureTaken = false;
count = 0; count = 0;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/PausableToken.sol"; import "../token/ERC20/PausableToken.sol";
...@@ -6,7 +6,7 @@ import "../token/ERC20/PausableToken.sol"; ...@@ -6,7 +6,7 @@ import "../token/ERC20/PausableToken.sol";
// mock class using PausableToken // mock class using PausableToken
contract PausableTokenMock is PausableToken { contract PausableTokenMock is PausableToken {
function PausableTokenMock(address initialAccount, uint initialBalance) public { constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/distribution/PostDeliveryCrowdsale.sol"; import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
...@@ -6,13 +6,13 @@ import "../crowdsale/distribution/PostDeliveryCrowdsale.sol"; ...@@ -6,13 +6,13 @@ import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale { contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale {
function PostDeliveryCrowdsaleImpl ( constructor (
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
ERC20 _token ERC20 _token
) )
public public
TimedCrowdsale(_openingTime, _closingTime) TimedCrowdsale(_openingTime, _closingTime)
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../payment/PullPayment.sol"; import "../payment/PullPayment.sol";
...@@ -7,7 +7,7 @@ import "../payment/PullPayment.sol"; ...@@ -7,7 +7,7 @@ import "../payment/PullPayment.sol";
// mock class using PullPayment // mock class using PullPayment
contract PullPaymentMock is PullPayment { contract PullPaymentMock is PullPayment {
function PullPaymentMock() public payable { } constructor() public payable { }
// test helper function to call asyncSend // test helper function to call asyncSend
function callSend(address dest, uint256 amount) public { function callSend(address dest, uint256 amount) public {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/rbac/RBACWithAdmin.sol"; import "../ownership/rbac/RBACWithAdmin.sol";
...@@ -16,7 +16,7 @@ contract RBACMock is RBACWithAdmin { ...@@ -16,7 +16,7 @@ contract RBACMock is RBACWithAdmin {
_; _;
} }
function RBACMock(address[] _advisors) constructor(address[] _advisors)
public public
{ {
addRole(msg.sender, ROLE_ADVISOR); addRole(msg.sender, ROLE_ADVISOR);
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
contract ReentrancyAttack { contract ReentrancyAttack {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ReentrancyGuard.sol"; import "../ReentrancyGuard.sol";
import "./ReentrancyAttack.sol"; import "./ReentrancyAttack.sol";
...@@ -8,7 +8,7 @@ contract ReentrancyMock is ReentrancyGuard { ...@@ -8,7 +8,7 @@ contract ReentrancyMock is ReentrancyGuard {
uint256 public counter; uint256 public counter;
function ReentrancyMock() public { constructor() public {
counter = 0; counter = 0;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol"; import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol"; import "../crowdsale/distribution/RefundableCrowdsale.sol";
...@@ -6,7 +6,7 @@ import "../crowdsale/distribution/RefundableCrowdsale.sol"; ...@@ -6,7 +6,7 @@ import "../crowdsale/distribution/RefundableCrowdsale.sol";
contract RefundableCrowdsaleImpl is RefundableCrowdsale { contract RefundableCrowdsaleImpl is RefundableCrowdsale {
function RefundableCrowdsaleImpl ( constructor (
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
uint256 _rate, uint256 _rate,
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../token/ERC20/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
...@@ -35,7 +35,7 @@ contract ERC20SucceedingMock is ERC20 { ...@@ -35,7 +35,7 @@ contract ERC20SucceedingMock is ERC20 {
function totalSupply() public view returns (uint256) { function totalSupply() public view returns (uint256) {
return 0; return 0;
} }
function transfer(address, uint256) public returns (bool) { function transfer(address, uint256) public returns (bool) {
return true; return true;
} }
...@@ -64,7 +64,7 @@ contract SafeERC20Helper { ...@@ -64,7 +64,7 @@ contract SafeERC20Helper {
ERC20 failing; ERC20 failing;
ERC20 succeeding; ERC20 succeeding;
function SafeERC20Helper() public { constructor() public {
failing = new ERC20FailingMock(); failing = new ERC20FailingMock();
succeeding = new ERC20SucceedingMock(); succeeding = new ERC20SucceedingMock();
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import {Bounty, Target} from "../../contracts/Bounty.sol"; import {Bounty, Target} from "../../contracts/Bounty.sol";
......
pragma solidity ^0.4.18; pragma solidity ^0.4.23;
import "../token/ERC20/StandardBurnableToken.sol"; import "../token/ERC20/StandardBurnableToken.sol";
contract StandardBurnableTokenMock is StandardBurnableToken { contract StandardBurnableTokenMock is StandardBurnableToken {
function StandardBurnableTokenMock(address initialAccount, uint initialBalance) public { constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol"; import "../token/ERC20/StandardToken.sol";
...@@ -6,7 +6,7 @@ import "../token/ERC20/StandardToken.sol"; ...@@ -6,7 +6,7 @@ import "../token/ERC20/StandardToken.sol";
// mock class using StandardToken // mock class using StandardToken
contract StandardTokenMock is StandardToken { contract StandardTokenMock is StandardToken {
function StandardTokenMock(address initialAccount, uint256 initialBalance) public { constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance; balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance; totalSupply_ = initialBalance;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/TimedCrowdsale.sol"; import "../crowdsale/validation/TimedCrowdsale.sol";
...@@ -6,7 +6,7 @@ import "../crowdsale/validation/TimedCrowdsale.sol"; ...@@ -6,7 +6,7 @@ import "../crowdsale/validation/TimedCrowdsale.sol";
contract TimedCrowdsaleImpl is TimedCrowdsale { contract TimedCrowdsaleImpl is TimedCrowdsale {
function TimedCrowdsaleImpl ( constructor (
uint256 _openingTime, uint256 _openingTime,
uint256 _closingTime, uint256 _closingTime,
uint256 _rate, uint256 _rate,
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../ownership/Whitelist.sol"; import "../ownership/Whitelist.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/WhitelistedCrowdsale.sol"; import "../crowdsale/validation/WhitelistedCrowdsale.sol";
...@@ -6,11 +6,11 @@ import "../crowdsale/validation/WhitelistedCrowdsale.sol"; ...@@ -6,11 +6,11 @@ import "../crowdsale/validation/WhitelistedCrowdsale.sol";
contract WhitelistedCrowdsaleImpl is WhitelistedCrowdsale { contract WhitelistedCrowdsaleImpl is WhitelistedCrowdsale {
function WhitelistedCrowdsaleImpl ( constructor (
uint256 _rate, uint256 _rate,
address _wallet, address _wallet,
ERC20 _token ERC20 _token
) )
public public
Crowdsale(_rate, _wallet, _token) Crowdsale(_rate, _wallet, _token)
{ {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
import "../token/ERC20/ERC20Basic.sol"; import "../token/ERC20/ERC20Basic.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Claimable.sol"; import "./Claimable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
...@@ -22,7 +22,7 @@ contract HasNoEther is Ownable { ...@@ -22,7 +22,7 @@ contract HasNoEther is Ownable {
* constructor. By doing it this way we prevent a payable constructor from working. Alternatively * constructor. By doing it this way we prevent a payable constructor from working. Alternatively
* we could use assembly to access msg.value. * we could use assembly to access msg.value.
*/ */
function HasNoEther() public payable { constructor() public payable {
require(msg.value == 0); require(msg.value == 0);
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./CanReclaimToken.sol"; import "./CanReclaimToken.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
...@@ -39,7 +39,7 @@ contract Heritable is Ownable { ...@@ -39,7 +39,7 @@ contract Heritable is Ownable {
* @param _heartbeatTimeout time available for the owner to notify they are alive, * @param _heartbeatTimeout time available for the owner to notify they are alive,
* before the heir can take ownership. * before the heir can take ownership.
*/ */
function Heritable(uint256 _heartbeatTimeout) public { constructor(uint256 _heartbeatTimeout) public {
setHeartbeatTimeout(_heartbeatTimeout); setHeartbeatTimeout(_heartbeatTimeout);
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./HasNoEther.sol"; import "./HasNoEther.sol";
import "./HasNoTokens.sol"; import "./HasNoTokens.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
...@@ -18,7 +18,7 @@ contract Ownable { ...@@ -18,7 +18,7 @@ contract Ownable {
* @dev The Ownable constructor sets the original `owner` of the contract to the sender * @dev The Ownable constructor sets the original `owner` of the contract to the sender
* account. * account.
*/ */
function Ownable() public { constructor() public {
owner = msg.sender; owner = msg.sender;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Ownable.sol"; import "./Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./Roles.sol"; import "./Roles.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./RBAC.sol"; import "./RBAC.sol";
...@@ -28,7 +28,7 @@ contract RBACWithAdmin is RBAC { ...@@ -28,7 +28,7 @@ contract RBACWithAdmin is RBAC {
/** /**
* @dev constructor. Sets msg.sender as admin by default * @dev constructor. Sets msg.sender as admin by default
*/ */
function RBACWithAdmin() constructor()
public public
{ {
addRole(msg.sender, ROLE_ADMIN); addRole(msg.sender, ROLE_ADMIN);
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
...@@ -21,7 +21,7 @@ contract SplitPayment { ...@@ -21,7 +21,7 @@ contract SplitPayment {
/** /**
* @dev Constructor * @dev Constructor
*/ */
function SplitPayment(address[] _payees, uint256[] _shares) public payable { constructor(address[] _payees, uint256[] _shares) public payable {
require(_payees.length == _shares.length); require(_payees.length == _shares.length);
for (uint256 i = 0; i < _payees.length; i++) { for (uint256 i = 0; i < _payees.length; i++) {
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC20Basic.sol"; import "./ERC20Basic.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./BasicToken.sol"; import "./BasicToken.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./MintableToken.sol"; import "./MintableToken.sol";
...@@ -11,7 +11,7 @@ contract CappedToken is MintableToken { ...@@ -11,7 +11,7 @@ contract CappedToken is MintableToken {
uint256 public cap; uint256 public cap;
function CappedToken(uint256 _cap) public { constructor(uint256 _cap) public {
require(_cap > 0); require(_cap > 0);
cap = _cap; cap = _cap;
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC20.sol"; import "./ERC20.sol";
...@@ -8,7 +8,7 @@ contract DetailedERC20 is ERC20 { ...@@ -8,7 +8,7 @@ contract DetailedERC20 is ERC20 {
string public symbol; string public symbol;
uint8 public decimals; uint8 public decimals;
function DetailedERC20(string _name, string _symbol, uint8 _decimals) public { constructor(string _name, string _symbol, uint8 _decimals) public {
name = _name; name = _name;
symbol = _symbol; symbol = _symbol;
decimals = _decimals; decimals = _decimals;
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC20Basic.sol"; import "./ERC20Basic.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./StandardToken.sol"; import "./StandardToken.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./StandardToken.sol"; import "./StandardToken.sol";
import "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC20Basic.sol"; import "./ERC20Basic.sol";
import "./ERC20.sol"; import "./ERC20.sol";
......
pragma solidity ^0.4.18; pragma solidity ^0.4.23;
import "./BurnableToken.sol"; import "./BurnableToken.sol";
import "./StandardToken.sol"; import "./StandardToken.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./BasicToken.sol"; import "./BasicToken.sol";
import "./ERC20.sol"; import "./ERC20.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./SafeERC20.sol"; import "./SafeERC20.sol";
...@@ -20,7 +20,7 @@ contract TokenTimelock { ...@@ -20,7 +20,7 @@ contract TokenTimelock {
// timestamp when token release is enabled // timestamp when token release is enabled
uint256 public releaseTime; uint256 public releaseTime;
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public { constructor(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public {
// solium-disable-next-line security/no-block-members // solium-disable-next-line security/no-block-members
require(_releaseTime > block.timestamp); require(_releaseTime > block.timestamp);
token = _token; token = _token;
......
/* solium-disable security/no-block-members */ /* solium-disable security/no-block-members */
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC20Basic.sol"; import "./ERC20Basic.sol";
import "./SafeERC20.sol"; import "./SafeERC20.sol";
...@@ -42,7 +42,7 @@ contract TokenVesting is Ownable { ...@@ -42,7 +42,7 @@ contract TokenVesting is Ownable {
* @param _duration duration in seconds of the period in which the tokens will vest * @param _duration duration in seconds of the period in which the tokens will vest
* @param _revocable whether the vesting is revocable or not * @param _revocable whether the vesting is revocable or not
*/ */
function TokenVesting( constructor(
address _beneficiary, address _beneficiary,
uint256 _start, uint256 _start,
uint256 _cliff, uint256 _cliff,
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC721.sol"; import "./ERC721.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
import "./ERC721Basic.sol"; import "./ERC721Basic.sol";
......
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment