Commit d643caf8 by Francisco Giordano

convert CapperRole and SignerRole to initializers

parent a010d88d
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);
} }
......
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);
} }
......
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);
} }
......
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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment