Merge pull request #576 from ajsantander/master

Address new compiler warnings
pull/378/merge
Francisco Giordano 7 years ago committed by GitHub
commit b9cbea1c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      contracts/Bounty.sol
  2. 2
      contracts/DayLimit.sol
  3. 2
      contracts/LimitBalance.sol
  4. 2
      contracts/MerkleProof.sol
  5. 2
      contracts/crowdsale/CappedCrowdsale.sol
  6. 4
      contracts/crowdsale/Crowdsale.sol
  7. 2
      contracts/crowdsale/RefundVault.sol
  8. 2
      contracts/crowdsale/RefundableCrowdsale.sol
  9. 2
      contracts/examples/SampleCrowdsale.sol
  10. 2
      contracts/examples/SimpleToken.sol
  11. 2
      contracts/lifecycle/Destructible.sol
  12. 2
      contracts/lifecycle/TokenDestructible.sol
  13. 2
      contracts/ownership/HasNoEther.sol
  14. 3
      contracts/ownership/HasNoTokens.sol
  15. 2
      contracts/ownership/Ownable.sol
  16. 2
      contracts/payment/SplitPayment.sol
  17. 2
      contracts/token/CappedToken.sol
  18. 2
      contracts/token/DetailedERC20.sol
  19. 2
      contracts/token/TokenTimelock.sol
  20. 2
      contracts/token/TokenVesting.sol
  21. 2
      test/helpers/BasicTokenMock.sol
  22. 2
      test/helpers/BurnableTokenMock.sol
  23. 2
      test/helpers/CappedCrowdsaleImpl.sol
  24. 2
      test/helpers/DayLimitMock.sol
  25. 2
      test/helpers/DetailedERC20Mock.sol
  26. 4
      test/helpers/ERC23TokenMock.sol
  27. 2
      test/helpers/FinalizableCrowdsaleImpl.sol
  28. 4
      test/helpers/ForceEther.sol
  29. 2
      test/helpers/HasNoEtherTest.sol
  30. 2
      test/helpers/InsecureTargetBounty.sol
  31. 2
      test/helpers/LimitBalanceMock.sol
  32. 2
      test/helpers/PausableMock.sol
  33. 2
      test/helpers/PausableTokenMock.sol
  34. 4
      test/helpers/PullPaymentMock.sol
  35. 2
      test/helpers/ReentrancyAttack.sol
  36. 2
      test/helpers/ReentrancyMock.sol
  37. 2
      test/helpers/RefundableCrowdsaleImpl.sol
  38. 34
      test/helpers/SafeERC20Helper.sol
  39. 6
      test/helpers/SafeMathMock.sol
  40. 2
      test/helpers/SecureTargetBounty.sol
  41. 4
      test/helpers/SplitPaymentMock.sol
  42. 2
      test/helpers/StandardTokenMock.sol

@ -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);
}

@ -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();
}

@ -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;
}

@ -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;

@ -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;
}

@ -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);
@ -61,7 +61,7 @@ contract Crowdsale {
// fallback function can be used to buy tokens
function () payable {
function () external payable {
buyTokens(msg.sender);
}

@ -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;

@ -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;

@ -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)

@ -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;
}

@ -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.

@ -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

@ -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);
}

@ -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();
}

@ -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;
}

@ -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++) {

@ -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;
}

@ -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;

@ -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;

@ -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);

@ -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;
}

@ -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;
}

@ -12,7 +12,7 @@ contract CappedCrowdsaleImpl is CappedCrowdsale {
uint256 _rate,
address _wallet,
uint256 _cap
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
CappedCrowdsale(_cap)
{

@ -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;
}

@ -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 {}
}

@ -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);

@ -11,7 +11,7 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
uint256 _endTime,
uint256 _rate,
address _wallet
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
FinalizableCrowdsale()
{

@ -7,9 +7,9 @@ pragma solidity ^0.4.18;
// @author Remco Bloemen <remco@neufund.org>
contract ForceEther {
function ForceEther() payable { }
function ForceEther() public payable { }
function destroyAndSend(address _recipient) {
function destroyAndSend(address _recipient) public {
selfdestruct(_recipient);
}
}

@ -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 {
}
}

@ -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;
}
}

@ -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 {
}
}

@ -9,7 +9,7 @@ contract PausableMock is Pausable {
bool public drasticMeasureTaken;
uint256 public count;
function PausableMock() {
function PausableMock() public {
drasticMeasureTaken = false;
count = 0;
}

@ -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;
}

@ -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);
}

@ -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));
}

@ -7,7 +7,7 @@ contract ReentrancyMock is ReentrancyGuard {
uint256 public counter;
function ReentrancyMock() {
function ReentrancyMock() public {
counter = 0;
}

@ -12,7 +12,7 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
uint256 _rate,
address _wallet,
uint256 _goal
)
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
RefundableCrowdsale(_goal)
{

@ -4,45 +4,45 @@ import '../../contracts/token/ERC20.sol';
import '../../contracts/token/SafeERC20.sol';
contract ERC20FailingMock is ERC20 {
function transfer(address, uint256) returns (bool) {
function transfer(address, uint256) public returns (bool) {
return false;
}
function transferFrom(address, address, uint256) returns (bool) {
function transferFrom(address, address, uint256) public returns (bool) {
return false;
}
function approve(address, uint256) returns (bool) {
function approve(address, uint256) public returns (bool) {
return false;
}
function balanceOf(address) constant returns (uint256) {
function balanceOf(address) public constant returns (uint256) {
return 0;
}
function allowance(address, address) constant returns (uint256) {
function allowance(address, address) public constant returns (uint256) {
return 0;
}
}
contract ERC20SucceedingMock is ERC20 {
function transfer(address, uint256) returns (bool) {
function transfer(address, uint256) public returns (bool) {
return true;
}
function transferFrom(address, address, uint256) returns (bool) {
function transferFrom(address, address, uint256) public returns (bool) {
return true;
}
function approve(address, uint256) returns (bool) {
function approve(address, uint256) public returns (bool) {
return true;
}
function balanceOf(address) constant returns (uint256) {
function balanceOf(address) public constant returns (uint256) {
return 0;
}
function allowance(address, address) constant returns (uint256) {
function allowance(address, address) public constant returns (uint256) {
return 0;
}
}
@ -53,32 +53,32 @@ contract SafeERC20Helper {
ERC20 failing;
ERC20 succeeding;
function SafeERC20Helper() {
function SafeERC20Helper() public {
failing = new ERC20FailingMock();
succeeding = new ERC20SucceedingMock();
}
function doFailingTransfer() {
function doFailingTransfer() public {
failing.safeTransfer(0, 0);
}
function doFailingTransferFrom() {
function doFailingTransferFrom() public {
failing.safeTransferFrom(0, 0, 0);
}
function doFailingApprove() {
function doFailingApprove() public {
failing.safeApprove(0, 0);
}
function doSucceedingTransfer() {
function doSucceedingTransfer() public {
succeeding.safeTransfer(0, 0);
}
function doSucceedingTransferFrom() {
function doSucceedingTransferFrom() public {
succeeding.safeTransferFrom(0, 0, 0);
}
function doSucceedingApprove() {
function doSucceedingApprove() public {
succeeding.safeApprove(0, 0);
}
}

@ -7,15 +7,15 @@ import '../../contracts/math/SafeMath.sol';
contract SafeMathMock {
uint256 public result;
function multiply(uint256 a, uint256 b) {
function multiply(uint256 a, uint256 b) public {
result = SafeMath.mul(a, b);
}
function subtract(uint256 a, uint256 b) {
function subtract(uint256 a, uint256 b) public {
result = SafeMath.sub(a, b);
}
function add(uint256 a, uint256 b) {
function add(uint256 a, uint256 b) public {
result = SafeMath.add(a, b);
}
}

@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
contract SecureTargetMock is Target {
function checkInvariant() returns(bool) {
function checkInvariant() public returns(bool) {
return true;
}
}

@ -4,7 +4,7 @@ import '../../contracts/payment/SplitPayment.sol';
// mock class using SplitPayment
contract SplitPaymentMock is SplitPayment {
function SplitPaymentMock(address[] _payees, uint256[] _shares)
function SplitPaymentMock(address[] _payees, uint256[] _shares) public
SplitPayment(_payees, _shares) payable {}
function () payable {}
function () external payable {}
}

@ -7,7 +7,7 @@ import '../../contracts/token/StandardToken.sol';
// mock class using StandardToken
contract StandardTokenMock is StandardToken {
function StandardTokenMock(address initialAccount, uint256 initialBalance) {
function StandardTokenMock(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}

Loading…
Cancel
Save