NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #79 from adklempner/naming

Browse Source 
Inherit Ownable in Migrations and Killable. Fix variable naming.
This commit is contained in:
Manuel Aráoz
2016-11-21 23:14:14 -03:00
committed by GitHub
parent fb0f9c0570 794596254b
commit 78f6b4cce0
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Killable.sol
View File

@ -6,7 +6,7 @@ import "./Ownable.sol";
* Base contract that can be killed by owner
*/
contract Killable is Ownable {
function kill() {
if (msg.sender == owner) selfdestruct(owner);
function kill() onlyOwner {
selfdestruct(owner);
}
}

23
contracts/Migrations.sol
View File

@ -1,22 +1,13 @@
pragma solidity ^0.4.4;
contract Migrations {
address public owner;
uint public last_completed_migration;
contract Migrations is Ownable {
uint public lastCompletedMigration;
modifier restricted() {
if (msg.sender == owner) _;
function setCompleted(uint completed) onlyOwner {
lastCompletedMigration = completed;
}
function Migrations() {
owner = msg.sender;
}
function setCompleted(uint completed) restricted {
last_completed_migration = completed;
}
function upgrade(address new_address) restricted {
Migrations upgraded = Migrations(new_address);
upgraded.setCompleted(last_completed_migration);
function upgrade(address newAddress) onlyOwner {
Migrations upgraded = Migrations(newAddress);
upgraded.setCompleted(lastCompletedMigration);
}
}