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
0962b9e5
Commit
0962b9e5
authored
Sep 25, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert ERC20Pausable to initializers
parent
c630cb40
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
ERC20PausableMock.sol
contracts/mocks/ERC20PausableMock.sol
+4
-1
ERC20Pausable.sol
contracts/token/ERC20/ERC20Pausable.sol
+6
-1
No files found.
contracts/mocks/ERC20PausableMock.sol
View file @
0962b9e5
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Pausable.sol";
import "../token/ERC20/ERC20Pausable.sol";
import "./PauserRoleMock.sol";
import "./PauserRoleMock.sol";
// mock class using ERC20Pausable
// mock class using ERC20Pausable
contract ERC20PausableMock is ERC20Pausable, PauserRoleMock {
contract ERC20PausableMock is
Initializable,
ERC20Pausable, PauserRoleMock {
constructor(address initialAccount, uint initialBalance) public {
constructor(address initialAccount, uint initialBalance) public {
ERC20Pausable.initialize();
_mint(initialAccount, initialBalance);
_mint(initialAccount, initialBalance);
}
}
...
...
contracts/token/ERC20/ERC20Pausable.sol
View file @
0962b9e5
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC20.sol";
import "./ERC20.sol";
import "../../lifecycle/Pausable.sol";
import "../../lifecycle/Pausable.sol";
...
@@ -8,7 +9,11 @@ import "../../lifecycle/Pausable.sol";
...
@@ -8,7 +9,11 @@ import "../../lifecycle/Pausable.sol";
* @title Pausable token
* @title Pausable token
* @dev ERC20 modified with pausable transfers.
* @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(
function transfer(
address to,
address to,
...
...
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