Commit 00f7c19d by Francisco Giordano

fix remaining tests

parent 5eafd1de
pragma solidity ^0.5.0; pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
...@@ -7,7 +9,13 @@ import "../../lifecycle/Pausable.sol"; ...@@ -7,7 +9,13 @@ import "../../lifecycle/Pausable.sol";
* @title PausableCrowdsale * @title PausableCrowdsale
* @dev Extension of Crowdsale contract where purchases can be paused and unpaused by the pauser role. * @dev Extension of Crowdsale contract where purchases can be paused and unpaused by the pauser role.
*/ */
contract PausableCrowdsale is Crowdsale, Pausable { contract PausableCrowdsale is Initializable, Crowdsale, Pausable {
function initialize(address sender) public initializer {
assert(Crowdsale._hasBeenInitialized());
Pausable.initialize(sender);
}
/** /**
* @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met. * @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met.
* Use super to concatenate validations. * Use super to concatenate validations.
......
...@@ -6,5 +6,6 @@ import "../crowdsale/validation/PausableCrowdsale.sol"; ...@@ -6,5 +6,6 @@ import "../crowdsale/validation/PausableCrowdsale.sol";
contract PausableCrowdsaleImpl is PausableCrowdsale { contract PausableCrowdsaleImpl is PausableCrowdsale {
constructor (uint256 _rate, address payable _wallet, ERC20 _token) public { constructor (uint256 _rate, address payable _wallet, ERC20 _token) public {
Crowdsale.initialize(_rate, _wallet, _token); Crowdsale.initialize(_rate, _wallet, _token);
PausableCrowdsale.initialize(msg.sender);
} }
} }
...@@ -3,6 +3,10 @@ pragma solidity ^0.5.0; ...@@ -3,6 +3,10 @@ pragma solidity ^0.5.0;
import "../access/roles/WhitelistedRole.sol"; import "../access/roles/WhitelistedRole.sol";
contract WhitelistedRoleMock is WhitelistedRole { contract WhitelistedRoleMock is WhitelistedRole {
constructor() public {
WhitelistedRole._initialize(msg.sender);
}
function onlyWhitelistedMock() public view onlyWhitelisted { function onlyWhitelistedMock() public view onlyWhitelisted {
// solhint-disable-previous-line no-empty-blocks // solhint-disable-previous-line no-empty-blocks
} }
......
const { shouldFail } = require('../helpers/shouldFail'); const shouldFail = require('../helpers/shouldFail');
require('../helpers/setup'); require('../helpers/setup');
......
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