From 0962b9e5e671c2c412d000f393e4fb0d66ee55b6 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 25 Sep 2018 18:53:24 -0300 Subject: [PATCH] convert ERC20Pausable to initializers --- contracts/mocks/ERC20PausableMock.sol | 5 ++++- contracts/token/ERC20/ERC20Pausable.sol | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contracts/mocks/ERC20PausableMock.sol b/contracts/mocks/ERC20PausableMock.sol index c4aa05d06..574cd04ee 100644 --- a/contracts/mocks/ERC20PausableMock.sol +++ b/contracts/mocks/ERC20PausableMock.sol @@ -1,13 +1,16 @@ pragma solidity ^0.4.24; +import "../Initializable.sol"; import "../token/ERC20/ERC20Pausable.sol"; import "./PauserRoleMock.sol"; // mock class using ERC20Pausable -contract ERC20PausableMock is ERC20Pausable, PauserRoleMock { +contract ERC20PausableMock is Initializable, ERC20Pausable, PauserRoleMock { constructor(address initialAccount, uint initialBalance) public { + ERC20Pausable.initialize(); + _mint(initialAccount, initialBalance); } diff --git a/contracts/token/ERC20/ERC20Pausable.sol b/contracts/token/ERC20/ERC20Pausable.sol index 32932355d..391753f88 100644 --- a/contracts/token/ERC20/ERC20Pausable.sol +++ b/contracts/token/ERC20/ERC20Pausable.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.24; +import "../../Initializable.sol"; import "./ERC20.sol"; import "../../lifecycle/Pausable.sol"; @@ -8,7 +9,11 @@ import "../../lifecycle/Pausable.sol"; * @title Pausable token * @dev ERC20 modified with pausable transfers. **/ -contract ERC20Pausable is ERC20, Pausable { +contract ERC20Pausable is Initializable, ERC20, Pausable { + + function initialize() public initializer { + Pausable.initialize(); + } function transfer( address to,