Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
d643caf8
Commit
d643caf8
authored
Sep 26, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert CapperRole and SignerRole to initializers
parent
a010d88d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
6 deletions
+18
-6
CapperRole.sol
contracts/access/roles/CapperRole.sol
+3
-2
SignerRole.sol
contracts/access/roles/SignerRole.sol
+3
-2
CapperRoleMock.sol
contracts/mocks/CapperRoleMock.sol
+6
-1
SignerRoleMock.sol
contracts/mocks/SignerRoleMock.sol
+6
-1
No files found.
contracts/access/roles/CapperRole.sol
View file @
d643caf8
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../Roles.sol";
import "../Roles.sol";
contract CapperRole {
contract CapperRole
is Initializable
{
using Roles for Roles.Role;
using Roles for Roles.Role;
event CapperAdded(address indexed account);
event CapperAdded(address indexed account);
...
@@ -11,7 +12,7 @@ contract CapperRole {
...
@@ -11,7 +12,7 @@ contract CapperRole {
Roles.Role private cappers;
Roles.Role private cappers;
constructor() public
{
function initialize() public initializer
{
cappers.add(msg.sender);
cappers.add(msg.sender);
}
}
...
...
contracts/access/roles/SignerRole.sol
View file @
d643caf8
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../Roles.sol";
import "../Roles.sol";
contract SignerRole {
contract SignerRole
is Initializable
{
using Roles for Roles.Role;
using Roles for Roles.Role;
event SignerAdded(address indexed account);
event SignerAdded(address indexed account);
...
@@ -11,7 +12,7 @@ contract SignerRole {
...
@@ -11,7 +12,7 @@ contract SignerRole {
Roles.Role private signers;
Roles.Role private signers;
constructor() public
{
function initialize() public initializer
{
signers.add(msg.sender);
signers.add(msg.sender);
}
}
...
...
contracts/mocks/CapperRoleMock.sol
View file @
d643caf8
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/CapperRole.sol";
import "../access/roles/CapperRole.sol";
contract CapperRoleMock is CapperRole {
contract CapperRoleMock is Initializable, CapperRole {
constructor() public {
CapperRole.initialize();
}
function removeCapper(address account) public {
function removeCapper(address account) public {
_removeCapper(account);
_removeCapper(account);
}
}
...
...
contracts/mocks/SignerRoleMock.sol
View file @
d643caf8
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/SignerRole.sol";
import "../access/roles/SignerRole.sol";
contract SignerRoleMock is SignerRole {
contract SignerRoleMock is Initializable, SignerRole {
constructor() public {
SignerRole.initialize();
}
function removeSigner(address account) public {
function removeSigner(address account) public {
_removeSigner(account);
_removeSigner(account);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment