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
a010d88d
Commit
a010d88d
authored
Sep 26, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert ERC721Pausable to initializers
parent
d3116fce
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
ERC721PausableMock.sol
contracts/mocks/ERC721PausableMock.sol
+6
-1
ERC721Pausable.sol
contracts/token/ERC721/ERC721Pausable.sol
+7
-1
No files found.
contracts/mocks/ERC721PausableMock.sol
View file @
a010d88d
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Pausable.sol";
import "./PauserRoleMock.sol";
...
...
@@ -8,7 +9,11 @@ import "./PauserRoleMock.sol";
* @title ERC721PausableMock
* This mock just provides a public mint, burn and exists functions for testing purposes
*/
contract ERC721PausableMock is ERC721Pausable, PauserRoleMock {
contract ERC721PausableMock is Initializable, ERC721Pausable, PauserRoleMock {
constructor() {
ERC721Pausable.initialize();
}
function mint(address to, uint256 tokenId) public {
super._mint(to, tokenId);
}
...
...
contracts/token/ERC721/ERC721Pausable.sol
View file @
a010d88d
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC721.sol";
import "../../lifecycle/Pausable.sol";
...
...
@@ -8,7 +9,12 @@ import "../../lifecycle/Pausable.sol";
* @title ERC721 Non-Fungible Pausable token
* @dev ERC721 modified with pausable transfers.
**/
contract ERC721Pausable is ERC721, Pausable {
contract ERC721Pausable is Initializable, ERC721, Pausable {
function initialize() public initializer {
ERC721.initialize();
Pausable.initialize();
}
function approve(
address to,
uint256 tokenId
...
...
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