Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
00f7c19d
Commit
00f7c19d
authored
Jan 21, 2019
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix remaining tests
parent
5eafd1de
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
PausableCrowdsale.sol
contracts/crowdsale/validation/PausableCrowdsale.sol
+9
-1
PausableCrowdsaleImpl.sol
contracts/mocks/PausableCrowdsaleImpl.sol
+1
-0
WhitelistedRoleMock.sol
contracts/mocks/WhitelistedRoleMock.sol
+4
-0
Ownable.test.js
test/ownership/Ownable.test.js
+1
-1
No files found.
contracts/crowdsale/validation/PausableCrowdsale.sol
View file @
00f7c19d
pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "../Crowdsale.sol";
import "../../lifecycle/Pausable.sol";
...
...
@@ -7,7 +9,13 @@ import "../../lifecycle/Pausable.sol";
* @title PausableCrowdsale
* @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.
* Use super to concatenate validations.
...
...
contracts/mocks/PausableCrowdsaleImpl.sol
View file @
00f7c19d
...
...
@@ -6,5 +6,6 @@ import "../crowdsale/validation/PausableCrowdsale.sol";
contract PausableCrowdsaleImpl is PausableCrowdsale {
constructor (uint256 _rate, address payable _wallet, ERC20 _token) public {
Crowdsale.initialize(_rate, _wallet, _token);
PausableCrowdsale.initialize(msg.sender);
}
}
contracts/mocks/WhitelistedRoleMock.sol
View file @
00f7c19d
...
...
@@ -3,6 +3,10 @@ pragma solidity ^0.5.0;
import "../access/roles/WhitelistedRole.sol";
contract WhitelistedRoleMock is WhitelistedRole {
constructor() public {
WhitelistedRole._initialize(msg.sender);
}
function onlyWhitelistedMock() public view onlyWhitelisted {
// solhint-disable-previous-line no-empty-blocks
}
...
...
test/ownership/Ownable.test.js
View file @
00f7c19d
const
{
shouldFail
}
=
require
(
'../helpers/shouldFail'
);
const
shouldFail
=
require
(
'../helpers/shouldFail'
);
require
(
'../helpers/setup'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment