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
2c2d80d9
Commit
2c2d80d9
authored
Sep 27, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert TimedCrowdsale to initializers
parent
6247a7bf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
TimedCrowdsale.sol
contracts/crowdsale/validation/TimedCrowdsale.sol
+6
-2
TimedCrowdsaleImpl.sol
contracts/mocks/TimedCrowdsaleImpl.sol
+4
-1
TimedCrowdsale.test.js
test/crowdsale/TimedCrowdsale.test.js
+1
-1
No files found.
contracts/crowdsale/validation/TimedCrowdsale.sol
View file @
2c2d80d9
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
...
...
@@ -8,7 +9,7 @@ import "../Crowdsale.sol";
* @title TimedCrowdsale
* @dev Crowdsale accepting contributions only within a time frame.
*/
contract TimedCrowdsale is Crowdsale {
contract TimedCrowdsale is
Initializable,
Crowdsale {
using SafeMath for uint256;
uint256 private _openingTime;
...
...
@@ -22,12 +23,15 @@ contract TimedCrowdsale is Crowdsale {
_;
}
constructor(uint256 openingTime, uint256 closingTime) public {
}
/**
* @dev Constructor, takes crowdsale opening and closing times.
* @param openingTime Crowdsale opening time
* @param closingTime Crowdsale closing time
*/
constructor(uint256 openingTime, uint256 closingTime) public
{
function initialize(uint256 openingTime, uint256 closingTime) public initializer
{
// solium-disable-next-line security/no-block-members
require(openingTime >= block.timestamp);
require(closingTime >= openingTime);
...
...
contracts/mocks/TimedCrowdsaleImpl.sol
View file @
2c2d80d9
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/validation/TimedCrowdsale.sol";
contract TimedCrowdsaleImpl is TimedCrowdsale {
contract TimedCrowdsaleImpl is
Initializable, Crowdsale,
TimedCrowdsale {
constructor (
uint256 openingTime,
...
...
@@ -17,6 +18,8 @@ contract TimedCrowdsaleImpl is TimedCrowdsale {
Crowdsale(rate, wallet, token)
TimedCrowdsale(openingTime, closingTime)
{
Crowdsale.initialize(rate, wallet, token);
TimedCrowdsale.initialize(openingTime, closingTime);
}
}
test/crowdsale/TimedCrowdsale.test.js
View file @
2c2d80d9
...
...
@@ -12,7 +12,7 @@ require('chai')
.
should
();
const
TimedCrowdsale
=
artifacts
.
require
(
'TimedCrowdsaleImpl'
);
const
SimpleToken
=
artifacts
.
require
(
'SimpleToken'
);
const
SimpleToken
=
artifacts
.
require
(
'SimpleToken
Mock
'
);
contract
(
'TimedCrowdsale'
,
function
([
_
,
investor
,
wallet
,
purchaser
])
{
const
rate
=
new
BigNumber
(
1
);
...
...
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