diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 430745055..921bd0d83 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable { 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); } diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol index 9f187284a..200a220dc 100644 --- a/contracts/mocks/SafeERC20Helper.sol +++ b/contracts/mocks/SafeERC20Helper.sol @@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 { return false; } - function balanceOf(address) public constant returns (uint256) { + function balanceOf(address) public view returns (uint256) { return 0; } - function allowance(address, address) public constant returns (uint256) { + function allowance(address, address) public view returns (uint256) { return 0; } } @@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 { return true; } - function balanceOf(address) public constant returns (uint256) { + function balanceOf(address) public view returns (uint256) { return 0; } - function allowance(address, address) public constant returns (uint256) { + function allowance(address, address) public view returns (uint256) { return 0; } } diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index ca01c5b0b..5617639e6 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,7 @@ pragma solidity ^0.4.21; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title Ownable diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 75aaafe82..cd9b14bc4 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,8 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; + contract DetailedERC20 is Migratable, ERC20 { string public name; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 53d8cb943..83801c1b3 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -4,8 +4,17 @@ import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; + 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); MintableToken.initialize(_sender); } diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index cd73a0602..3dec80e89 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -4,8 +4,18 @@ import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; + 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); _premint(_sender, _initialBalance); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index ebebd20bf..35003dd00 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -4,6 +4,7 @@ import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title Mintable token * @dev Simple ERC20 Token example, with mintable token creation @@ -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); } diff --git a/contracts/token/ERC20/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol index 23c299746..a22370885 100644 --- a/contracts/token/ERC20/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol"; **/ 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); } diff --git a/contracts/token/ERC20/StandardBurnableToken.sol b/contracts/token/ERC20/StandardBurnableToken.sol index 3a337331e..03767c2eb 100644 --- a/contracts/token/ERC20/StandardBurnableToken.sol +++ b/contracts/token/ERC20/StandardBurnableToken.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "./BurnableToken.sol"; import "./StandardToken.sol"; + /** * @title Standard Burnable Token * @dev Adds burnFrom method to ERC20 implementations diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 003e1d7b7..0ceaa1fd9 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a @@ -20,7 +21,15 @@ contract TokenTimelock is Migratable { // timestamp when token release is enabled 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 require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 83b0e478e..8b9a2c091 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index c950cfe41..9d6a14ed8 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -3,11 +3,12 @@ pragma solidity ^0.4.21; import "./ERC721Token.sol"; import "../../ownership/Ownable.sol"; + /** * @title Mintable ERC721 Token */ 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); ERC721Token.initialize(_name, _symbol); }