Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/Bounty.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ contract Bounty is PullPayment, Destructible {
/**
* @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
*/
function() payable {
function() external payable {
require(!claimed);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/DayLimit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ contract DayLimit {
* @dev Constructor that sets the passed value as a dailyLimit.
* @param _limit uint256 to represent the daily limit.
*/
function DayLimit(uint256 _limit) {
function DayLimit(uint256 _limit) public {
dailyLimit = _limit;
lastDay = today();
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/LimitBalance.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ contract LimitBalance {
* @dev Constructor that sets the passed value as a limit.
* @param _limit uint256 to represent the limit.
*/
function LimitBalance(uint256 _limit) {
function LimitBalance(uint256 _limit) public {
limit = _limit;
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/MerkleProof.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ library MerkleProof {
* @param _root Merkle root
* @param _leaf Leaf of Merkle tree
*/
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) pure returns (bool) {
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) {
// Check if proof length is a multiple of 32
if (_proof.length % 32 != 0) return false;

Expand Down
2 changes: 1 addition & 1 deletion contracts/crowdsale/CappedCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contract CappedCrowdsale is Crowdsale {

uint256 public cap;

function CappedCrowdsale(uint256 _cap) {
function CappedCrowdsale(uint256 _cap) public {
require(_cap > 0);
cap = _cap;
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/crowdsale/Crowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ contract Crowdsale {
event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);


function Crowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet) {
function Crowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet) public {
require(_startTime >= now);
require(_endTime >= _startTime);
require(_rate > 0);
Expand All @@ -61,7 +61,7 @@ contract Crowdsale {


// fallback function can be used to buy tokens
function () payable {
function () external payable {
buyTokens(msg.sender);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/crowdsale/RefundVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract RefundVault is Ownable {
event RefundsEnabled();
event Refunded(address indexed beneficiary, uint256 weiAmount);

function RefundVault(address _wallet) {
function RefundVault(address _wallet) public {
require(_wallet != address(0));
wallet = _wallet;
state = State.Active;
Expand Down
2 changes: 1 addition & 1 deletion contracts/crowdsale/RefundableCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
// refund vault used to hold funds while crowdsale is running
RefundVault public vault;

function RefundableCrowdsale(uint256 _goal) {
function RefundableCrowdsale(uint256 _goal) public {
require(_goal > 0);
vault = new RefundVault(wallet);
goal = _goal;
Expand Down
2 changes: 1 addition & 1 deletion contracts/examples/SampleCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract SampleCrowdsaleToken is MintableToken {
*/
contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {

function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet)
function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet) public
CappedCrowdsale(_cap)
FinalizableCrowdsale()
RefundableCrowdsale(_goal)
Expand Down
2 changes: 1 addition & 1 deletion contracts/examples/SimpleToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract SimpleToken is StandardToken {
/**
* @dev Constructor that gives msg.sender all of existing tokens.
*/
function SimpleToken() {
function SimpleToken() public {
totalSupply = INITIAL_SUPPLY;
balances[msg.sender] = INITIAL_SUPPLY;
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/lifecycle/Destructible.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
*/
contract Destructible is Ownable {

function Destructible() payable { }
function Destructible() public payable { }

/**
* @dev Transfers the current balance to the owner and terminates the contract.
Expand Down
2 changes: 1 addition & 1 deletion contracts/lifecycle/TokenDestructible.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import "../token/ERC20Basic.sol";
*/
contract TokenDestructible is Ownable {

function TokenDestructible() payable { }
function TokenDestructible() public payable { }

/**
* @notice Terminate contract and refund to owner
Expand Down
2 changes: 1 addition & 1 deletion contracts/ownership/HasNoEther.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract HasNoEther is Ownable {
* constructor. By doing it this way we prevent a payable constructor from working. Alternatively
* we could use assembly to access msg.value.
*/
function HasNoEther() payable {
function HasNoEther() public payable {
require(msg.value == 0);
}

Expand Down
3 changes: 3 additions & 0 deletions contracts/ownership/HasNoTokens.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ contract HasNoTokens is CanReclaimToken {
* @param data_ Bytes The data passed from the caller.
*/
function tokenFallback(address from_, uint256 value_, bytes data_) external {
from_;
value_;
data_;
revert();
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/ownership/Ownable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ contract Ownable {
* @dev The Ownable constructor sets the original `owner` of the contract to the sender
* account.
*/
function Ownable() {
function Ownable() public {
owner = msg.sender;
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/payment/SplitPayment.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract SplitPayment {
/**
* @dev Constructor
*/
function SplitPayment(address[] _payees, uint256[] _shares) {
function SplitPayment(address[] _payees, uint256[] _shares) public {
require(_payees.length == _shares.length);

for (uint256 i = 0; i < _payees.length; i++) {
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/CappedToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contract CappedToken is MintableToken {

uint256 public cap;

function CappedToken(uint256 _cap) {
function CappedToken(uint256 _cap) public {
require(_cap > 0);
cap = _cap;
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/DetailedERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ contract DetailedERC20 is ERC20 {
string public symbol;
uint8 public decimals;

function DetailedERC20(string _name, string _symbol, uint8 _decimals) {
function DetailedERC20(string _name, string _symbol, uint8 _decimals) public {
name = _name;
symbol = _symbol;
decimals = _decimals;
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/TokenTimelock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract TokenTimelock {
// timestamp when token release is enabled
uint64 public releaseTime;

function TokenTimelock(ERC20Basic _token, address _beneficiary, uint64 _releaseTime) {
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint64 _releaseTime) public {
require(_releaseTime > now);
token = _token;
beneficiary = _beneficiary;
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/TokenVesting.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ contract TokenVesting is Ownable {
* @param _duration duration in seconds of the period in which the tokens will vest
* @param _revocable whether the vesting is revocable or not
*/
function TokenVesting(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable) {
function TokenVesting(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable) public {
require(_beneficiary != address(0));
require(_cliff <= _duration);

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/BasicTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import '../../contracts/token/BasicToken.sol';
// mock class using BasicToken
contract BasicTokenMock is BasicToken {

function BasicTokenMock(address initialAccount, uint256 initialBalance) {
function BasicTokenMock(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/BurnableTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import '../../contracts/token/BurnableToken.sol';

contract BurnableTokenMock is BurnableToken {

function BurnableTokenMock(address initialAccount, uint initialBalance) {
function BurnableTokenMock(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/CappedCrowdsaleImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contract CappedCrowdsaleImpl is CappedCrowdsale {
uint256 _rate,
address _wallet,
uint256 _cap
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
CappedCrowdsale(_cap)
{
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/DayLimitMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
uint256 public totalSpending;

function DayLimitMock(uint256 _value) DayLimit(_value) {
function DayLimitMock(uint256 _value) public DayLimit(_value) {
totalSpending = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/DetailedERC20Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import '../../contracts/token/StandardToken.sol';
import '../../contracts/token/DetailedERC20.sol';

contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) {}
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
}
4 changes: 2 additions & 2 deletions test/helpers/ERC23TokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ contract ERC23ContractInterface {

contract ERC23TokenMock is BasicToken {

function ERC23TokenMock(address initialAccount, uint256 initialBalance) {
function ERC23TokenMock(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}

// ERC23 compatible transfer function (except the name)
function transferERC23(address _to, uint256 _value, bytes _data)
function transferERC23(address _to, uint256 _value, bytes _data) public
returns (bool success)
{
transfer(_to, _value);
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/FinalizableCrowdsaleImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
uint256 _endTime,
uint256 _rate,
address _wallet
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
FinalizableCrowdsale()
{
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/ForceEther.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ pragma solidity ^0.4.18;
// @author Remco Bloemen <[email protected]>
contract ForceEther {

function ForceEther() payable { }
function ForceEther() public payable { }

function destroyAndSend(address _recipient) {
function destroyAndSend(address _recipient) public {
selfdestruct(_recipient);
}
}
2 changes: 1 addition & 1 deletion test/helpers/HasNoEtherTest.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther {

// Constructor with explicit payable — should still fail
function HasNoEtherTest() payable {
function HasNoEtherTest() public payable {
}

}
2 changes: 1 addition & 1 deletion test/helpers/InsecureTargetBounty.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";


contract InsecureTargetMock is Target {
function checkInvariant() returns(bool){
function checkInvariant() public returns(bool){
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/LimitBalanceMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import '../../contracts/LimitBalance.sol';
// mock class using LimitBalance
contract LimitBalanceMock is LimitBalance(1000) {

function limitedDeposit() payable limitedPayable {
function limitedDeposit() public payable limitedPayable {
}

}
2 changes: 1 addition & 1 deletion test/helpers/PausableMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contract PausableMock is Pausable {
bool public drasticMeasureTaken;
uint256 public count;

function PausableMock() {
function PausableMock() public {
drasticMeasureTaken = false;
count = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/PausableTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import '../../contracts/token/PausableToken.sol';
// mock class using PausableToken
contract PausableTokenMock is PausableToken {

function PausableTokenMock(address initialAccount, uint initialBalance) {
function PausableTokenMock(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance;
}

Expand Down
4 changes: 2 additions & 2 deletions test/helpers/PullPaymentMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import '../../contracts/payment/PullPayment.sol';
// mock class using PullPayment
contract PullPaymentMock is PullPayment {

function PullPaymentMock() payable { }
function PullPaymentMock() public payable { }

// test helper function to call asyncSend
function callSend(address dest, uint256 amount) {
function callSend(address dest, uint256 amount) public {
asyncSend(dest, amount);
}

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/ReentrancyAttack.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pragma solidity ^0.4.18;

contract ReentrancyAttack {

function callSender(bytes4 data) {
function callSender(bytes4 data) public {
require(msg.sender.call(data));
}

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/ReentrancyMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ contract ReentrancyMock is ReentrancyGuard {

uint256 public counter;

function ReentrancyMock() {
function ReentrancyMock() public {
counter = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/RefundableCrowdsaleImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
uint256 _rate,
address _wallet,
uint256 _goal
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
RefundableCrowdsale(_goal)
{
Expand Down
Loading