NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert ERC721Pausable to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-26 17:07:39 -03:00
parent d3116fcea8
commit a010d88def
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/mocks/ERC721PausableMock.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Pausable.sol"; import "../token/ERC721/ERC721Pausable.sol";
import "./PauserRoleMock.sol"; import "./PauserRoleMock.sol";
@ -8,7 +9,11 @@ import "./PauserRoleMock.sol";
* @title ERC721PausableMock * @title ERC721PausableMock
* This mock just provides a public mint, burn and exists functions for testing purposes * 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 { function mint(address to, uint256 tokenId) public {
super._mint(to, tokenId); super._mint(to, tokenId);
} }

8
contracts/token/ERC721/ERC721Pausable.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
@ -8,7 +9,12 @@ import "../../lifecycle/Pausable.sol";
* @title ERC721 Non-Fungible Pausable token * @title ERC721 Non-Fungible Pausable token
* @dev ERC721 modified with pausable transfers. * @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( function approve(
address to, address to,
uint256 tokenId uint256 tokenId