Skip to content

Shareable: improved code to styling conventions, added functionality todo with owners #208

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

Closed
RFV wants to merge 4 commits into from
Closed

Shareable: improved code to styling conventions, added functionality todo with owners #208

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
193302c
Fixed modifier naming styles
May 3, 2017
18ffade
fixed one function parameter naming style
May 3, 2017
ab9c48e
added ownerAdd, ownerRemove, changeRequirement, and thus removed the …
May 3, 2017
1b0f2ad
Changed the Zeppelin Destroy functionality fundamentally, to limit lo…
May 4, 2017
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
Next Next commit
Fixed modifier naming styles
  • Loading branch information
Riaan F Venter committed May 3, 2017
commit 193302c48b6d6a1c777a6fcc1330565a418519ff
6 changes: 3 additions & 3 deletions contracts/ownership/Shareable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pragma solidity ^0.4.8;
* inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a single, or, crucially, each of a number of, designated owners.
*
* usage:
* use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by some number (specified in constructor) of the set of owners (specified in the constructor) before the interior is executed.
* use modifiers onlyOwner (just own owned) or onlyManyOwners(hash), whereby the same hash must be provided by some number (specified in constructor) of the set of owners (specified in the constructor) before the interior is executed.
*/
contract Shareable {
// struct for the status of a pending operation.
Expand Down Expand Up @@ -48,13 +48,13 @@ contract Shareable {
// multi-sig function modifier: the operation must have an intrinsic hash in order
// that later attempts can be realised as the same underlying operation and
// thus count as confirmations.
modifier onlymanyowners(bytes32 _operation) {
modifier onlyManyOwners(bytes32 _operation) {
if (confirmAndCheck(_operation)) {
_;
}
}

// constructor is given number of sigs required to do protected "onlymanyowners" transactions
// constructor is given number of sigs required to do protected "onlyManyOwners" transactions
// as well as the selection of addresses capable of confirming them.
function Shareable(address[] _owners, uint _required) {
owners[1] = msg.sender;
Expand Down