Commit 700b8118 by Francisco Giordano

fix linter errors and warnings

parent 16f04b13
...@@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable { ...@@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable {
bool public paused = false; bool public paused = false;
function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") { function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") public {
Ownable.initialize(_sender); Ownable.initialize(_sender);
} }
......
...@@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 { ...@@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 {
return false; return false;
} }
function balanceOf(address) public constant returns (uint256) { function balanceOf(address) public view returns (uint256) {
return 0; return 0;
} }
function allowance(address, address) public constant returns (uint256) { function allowance(address, address) public view returns (uint256) {
return 0; return 0;
} }
} }
...@@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 { ...@@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 {
return true; return true;
} }
function balanceOf(address) public constant returns (uint256) { function balanceOf(address) public view returns (uint256) {
return 0; return 0;
} }
function allowance(address, address) public constant returns (uint256) { function allowance(address, address) public view returns (uint256) {
return 0; return 0;
} }
} }
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import 'zos-lib/contracts/migrations/Migratable.sol'; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
* @title Ownable * @title Ownable
......
pragma solidity ^0.4.21; pragma solidity ^0.4.21;
import "./ERC20.sol"; import "./ERC20.sol";
import 'zos-lib/contracts/migrations/Migratable.sol'; import "zos-lib/contracts/migrations/Migratable.sol";
contract DetailedERC20 is Migratable, ERC20 { contract DetailedERC20 is Migratable, ERC20 {
string public name; string public name;
......
...@@ -4,8 +4,17 @@ import "zos-lib/contracts/migrations/Migratable.sol"; ...@@ -4,8 +4,17 @@ import "zos-lib/contracts/migrations/Migratable.sol";
import "./DetailedERC20.sol"; import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken {
function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { function initialize(
address _sender,
string _name,
string _symbol,
uint8 _decimals
)
isInitializer("DetailedMintableToken", "1.9.0-beta")
public
{
DetailedERC20.initialize(_name, _symbol, _decimals); DetailedERC20.initialize(_name, _symbol, _decimals);
MintableToken.initialize(_sender); MintableToken.initialize(_sender);
} }
......
...@@ -4,8 +4,18 @@ import "zos-lib/contracts/migrations/Migratable.sol"; ...@@ -4,8 +4,18 @@ import "zos-lib/contracts/migrations/Migratable.sol";
import "./DetailedERC20.sol"; import "./DetailedERC20.sol";
import "./MintableToken.sol"; import "./MintableToken.sol";
contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken {
function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "1.9.0-beta") { function initialize(
address _sender,
string _name,
string _symbol,
uint8 _decimals,
uint256 _initialBalance
)
isInitializer("DetailedPremintedToken", "1.9.0-beta")
public
{
DetailedERC20.initialize(_name, _symbol, _decimals); DetailedERC20.initialize(_name, _symbol, _decimals);
_premint(_sender, _initialBalance); _premint(_sender, _initialBalance);
......
...@@ -4,6 +4,7 @@ import "./StandardToken.sol"; ...@@ -4,6 +4,7 @@ import "./StandardToken.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
import "zos-lib/contracts/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
* @title Mintable token * @title Mintable token
* @dev Simple ERC20 Token example, with mintable token creation * @dev Simple ERC20 Token example, with mintable token creation
...@@ -22,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken { ...@@ -22,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken {
_; _;
} }
function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") { function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") public {
Ownable.initialize(_sender); Ownable.initialize(_sender);
} }
......
...@@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol"; ...@@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol";
**/ **/
contract PausableToken is Migratable, StandardToken, Pausable { contract PausableToken is Migratable, StandardToken, Pausable {
function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") { function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") public {
Pausable.initialize(_sender); Pausable.initialize(_sender);
} }
......
...@@ -3,6 +3,7 @@ pragma solidity ^0.4.18; ...@@ -3,6 +3,7 @@ pragma solidity ^0.4.18;
import "./BurnableToken.sol"; import "./BurnableToken.sol";
import "./StandardToken.sol"; import "./StandardToken.sol";
/** /**
* @title Standard Burnable Token * @title Standard Burnable Token
* @dev Adds burnFrom method to ERC20 implementations * @dev Adds burnFrom method to ERC20 implementations
......
...@@ -3,6 +3,7 @@ pragma solidity ^0.4.21; ...@@ -3,6 +3,7 @@ pragma solidity ^0.4.21;
import "./SafeERC20.sol"; import "./SafeERC20.sol";
import "zos-lib/contracts/migrations/Migratable.sol"; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
* @title TokenTimelock * @title TokenTimelock
* @dev TokenTimelock is a token holder contract that will allow a * @dev TokenTimelock is a token holder contract that will allow a
...@@ -20,7 +21,15 @@ contract TokenTimelock is Migratable { ...@@ -20,7 +21,15 @@ contract TokenTimelock is Migratable {
// timestamp when token release is enabled // timestamp when token release is enabled
uint256 public releaseTime; uint256 public releaseTime;
function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "1.9.0-beta") { function initialize(
address _sender,
ERC20Basic _token,
address _beneficiary,
uint256 _releaseTime
)
isInitializer("TokenTimelock", "1.9.0-beta")
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;
......
...@@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; ...@@ -6,7 +6,7 @@ import "./ERC20Basic.sol";
import "./SafeERC20.sol"; import "./SafeERC20.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import 'zos-lib/contracts/migrations/Migratable.sol'; import "zos-lib/contracts/migrations/Migratable.sol";
/** /**
......
...@@ -3,11 +3,12 @@ pragma solidity ^0.4.21; ...@@ -3,11 +3,12 @@ pragma solidity ^0.4.21;
import "./ERC721Token.sol"; import "./ERC721Token.sol";
import "../../ownership/Ownable.sol"; import "../../ownership/Ownable.sol";
/** /**
* @title Mintable ERC721 Token * @title Mintable ERC721 Token
*/ */
contract MintableERC721Token is Migratable, Ownable, ERC721Token { contract MintableERC721Token is Migratable, Ownable, ERC721Token {
function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") { function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") public {
Ownable.initialize(_sender); Ownable.initialize(_sender);
ERC721Token.initialize(_name, _symbol); ERC721Token.initialize(_name, _symbol);
} }
......
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