Skip to content

abstract to abstractcontract and modifiers with semicolons #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomw1808 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

abstract to abstractcontract and modifiers with semicolons #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ node_modules/
db/
mochawesome-reports/
**/*.swp

.idea
.contract_cache
18 changes: 9 additions & 9 deletions contract/std.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// for contract not
// to be deployed to
// any environment
contract abstract {}
contract abstractcontract {}

contract owned is abstract {
contract owned is abstractcontract {
address owner;
function owned() {
owner = msg.sender;
Expand All @@ -13,42 +13,42 @@ contract owned is abstract {
owner = newOwner;
}
modifier onlyowner() {
if (msg.sender==owner) _
if (msg.sender==owner) _;
}
}

contract mortal is abstract, owned {
contract mortal is abstractcontract, owned {
function kill() onlyowner {
if (msg.sender == owner) suicide(owner);
}
}

contract NameReg is abstract {
contract NameReg is abstractcontract {
function register(bytes32 name) {}
function unregister() {}
function addressOf(bytes32 name) constant returns (address addr) {}
function nameOf(address addr) constant returns (bytes32 name) {}
function kill() {}
}

contract nameRegAware is abstract {
contract nameRegAware is abstractcontract {
function nameRegAddress() returns (address) {
return 0x0860a8008298322a142c09b528207acb5ab7effc;
}

function named(bytes32 name) returns (address) {
return NameReg(nameRegAddress()).addressOf(name);
}
}

contract named is abstract, nameRegAware {
contract named is abstractcontract, nameRegAware {
function named(bytes32 name) {
NameReg(nameRegAddress()).register(name);
}
}

// contract with util functions
contract util is abstract {
contract util is abstractcontract {
// Converts 'string' to 'bytes32'
function s2b(string s) internal returns (bytes32) {
bytes memory b = bytes(s);
Expand Down
6 changes: 3 additions & 3 deletions contract/vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ contract Vault {

modifier only_owner() {
if(msg.sender != owner) throw;
_
_;
}

modifier only_recovery() {
if(msg.sender != recovery) throw;
_
_;
}

/**
Expand Down