From 3f51d342d1381cefb3ae7031596cf3d4447ff8ff Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Tue, 25 Sep 2018 17:40:38 -0300
Subject: [PATCH] convert ERC20Mintable

---
 contracts/mocks/ERC20MintableMock.sol   | 8 +++++++-
 contracts/token/ERC20/ERC20Mintable.sol | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/contracts/mocks/ERC20MintableMock.sol b/contracts/mocks/ERC20MintableMock.sol
index a2056548f..49c4c9a31 100644
--- a/contracts/mocks/ERC20MintableMock.sol
+++ b/contracts/mocks/ERC20MintableMock.sol
@@ -1,8 +1,14 @@
 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../token/ERC20/ERC20Mintable.sol";
 import "./MinterRoleMock.sol";
 
 
-contract ERC20MintableMock is ERC20Mintable, MinterRoleMock {
+contract ERC20MintableMock is Initializable, ERC20Mintable, MinterRoleMock {
+
+  constructor() public {
+    ERC20Mintable.initialize();
+  }
+
 }
diff --git a/contracts/token/ERC20/ERC20Mintable.sol b/contracts/token/ERC20/ERC20Mintable.sol
index 20cc200ed..7d6f270a6 100644
--- a/contracts/token/ERC20/ERC20Mintable.sol
+++ b/contracts/token/ERC20/ERC20Mintable.sol
@@ -1,5 +1,6 @@
 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "./ERC20.sol";
 import "../../access/roles/MinterRole.sol";
 
@@ -8,7 +9,7 @@ import "../../access/roles/MinterRole.sol";
  * @title ERC20Mintable
  * @dev ERC20 minting logic
  */
-contract ERC20Mintable is ERC20, MinterRole {
+contract ERC20Mintable is Initializable, ERC20, MinterRole {
   event MintingFinished();
 
   bool private _mintingFinished = false;
@@ -18,6 +19,10 @@ contract ERC20Mintable is ERC20, MinterRole {
     _;
   }
 
+  function initialize() public initializer {
+    MinterRole.initialize();
+  }
+
   /**
    * @return true if the minting is finished.
    */