From d643caf8feccc3ad3c648f49382a62b161c33ed2 Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Wed, 26 Sep 2018 17:18:45 -0300
Subject: [PATCH] convert CapperRole and SignerRole to initializers

---
 contracts/access/roles/CapperRole.sol | 5 +++--
 contracts/access/roles/SignerRole.sol | 5 +++--
 contracts/mocks/CapperRoleMock.sol    | 7 ++++++-
 contracts/mocks/SignerRoleMock.sol    | 7 ++++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/contracts/access/roles/CapperRole.sol b/contracts/access/roles/CapperRole.sol
index a37a119e8..4cc9f01fc 100644
--- a/contracts/access/roles/CapperRole.sol
+++ b/contracts/access/roles/CapperRole.sol
@@ -1,9 +1,10 @@
 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "../Roles.sol";
 
 
-contract CapperRole {
+contract CapperRole is Initializable {
   using Roles for Roles.Role;
 
   event CapperAdded(address indexed account);
@@ -11,7 +12,7 @@ contract CapperRole {
 
   Roles.Role private cappers;
 
-  constructor() public {
+  function initialize() public initializer {
     cappers.add(msg.sender);
   }
 
diff --git a/contracts/access/roles/SignerRole.sol b/contracts/access/roles/SignerRole.sol
index a6ab48305..6fe12f88e 100644
--- a/contracts/access/roles/SignerRole.sol
+++ b/contracts/access/roles/SignerRole.sol
@@ -1,9 +1,10 @@
 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "../Roles.sol";
 
 
-contract SignerRole {
+contract SignerRole is Initializable {
   using Roles for Roles.Role;
 
   event SignerAdded(address indexed account);
@@ -11,7 +12,7 @@ contract SignerRole {
 
   Roles.Role private signers;
 
-  constructor() public {
+  function initialize() public initializer {
     signers.add(msg.sender);
   }
 
diff --git a/contracts/mocks/CapperRoleMock.sol b/contracts/mocks/CapperRoleMock.sol
index 05c15c9dd..072bf7972 100644
--- a/contracts/mocks/CapperRoleMock.sol
+++ b/contracts/mocks/CapperRoleMock.sol
@@ -1,9 +1,14 @@
 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../access/roles/CapperRole.sol";
 
 
-contract CapperRoleMock is CapperRole {
+contract CapperRoleMock is Initializable, CapperRole {
+  constructor() public {
+    CapperRole.initialize();
+  }
+
   function removeCapper(address account) public {
     _removeCapper(account);
   }
diff --git a/contracts/mocks/SignerRoleMock.sol b/contracts/mocks/SignerRoleMock.sol
index ba71cdeaa..f8f6301f4 100644
--- a/contracts/mocks/SignerRoleMock.sol
+++ b/contracts/mocks/SignerRoleMock.sol
@@ -1,9 +1,14 @@
 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../access/roles/SignerRole.sol";
 
 
-contract SignerRoleMock is SignerRole {
+contract SignerRoleMock is Initializable, SignerRole {
+  constructor() public {
+    SignerRole.initialize();
+  }
+
   function removeSigner(address account) public {
     _removeSigner(account);
   }