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
7cee6df3
Commit
7cee6df3
authored
Sep 25, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert ERC20Capped to initializers
parent
57325f51
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
ERC20CappedMock.sol
contracts/mocks/ERC20CappedMock.sol
+14
-0
ERC20Capped.sol
contracts/token/ERC20/ERC20Capped.sol
+6
-2
ERC20Capped.test.js
test/token/ERC20/ERC20Capped.test.js
+1
-1
No files found.
contracts/mocks/ERC20CappedMock.sol
0 → 100644
View file @
7cee6df3
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Capped.sol";
import "./MinterRoleMock.sol";
contract ERC20CappedMock is Initializable, ERC20Capped, MinterRoleMock {
constructor(uint256 cap) public {
ERC20Capped.initialize(cap);
}
}
contracts/token/ERC20/ERC20Capped.sol
View file @
7cee6df3
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC20Mintable.sol";
...
...
@@ -7,13 +8,16 @@ import "./ERC20Mintable.sol";
* @title Capped token
* @dev Mintable token with a token cap.
*/
contract ERC20Capped is ERC20Mintable {
contract ERC20Capped is
Initializable,
ERC20Mintable {
uint256 private _cap;
constructor
(uint256 cap)
function initialize
(uint256 cap)
public
initializer
{
ERC20Mintable.initialize();
require(cap > 0);
_cap = cap;
}
...
...
test/token/ERC20/ERC20Capped.test.js
View file @
7cee6df3
...
...
@@ -3,7 +3,7 @@ const { ether } = require('../../helpers/ether');
const
{
shouldBehaveLikeERC20Mintable
}
=
require
(
'./behaviors/ERC20Mintable.behavior'
);
const
{
shouldBehaveLikeERC20Capped
}
=
require
(
'./behaviors/ERC20Capped.behavior'
);
const
ERC20Capped
=
artifacts
.
require
(
'ERC20Capped'
);
const
ERC20Capped
=
artifacts
.
require
(
'ERC20Capped
Mock
'
);
contract
(
'ERC20Capped'
,
function
([
_
,
minter
,
...
otherAccounts
])
{
const
cap
=
ether
(
1000
);
...
...
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