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

convert ERC721Mintable to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-25 17:56:44 -03:00
parent f3a0a6a463
commit 5c1c43d2e1
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/mocks/ERC721MintableBurnableImpl.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Full.sol"; import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol"; import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721Burnable.sol"; import "../token/ERC721/ERC721Burnable.sol";
@ -9,12 +10,12 @@ import "../token/ERC721/ERC721Burnable.sol";
* @title ERC721MintableBurnableImpl * @title ERC721MintableBurnableImpl
*/ */
contract ERC721MintableBurnableImpl contract ERC721MintableBurnableImpl
is ERC721Full, ERC721Mintable, ERC721Burnable { is Initializable, ERC721Full, ERC721Mintable, ERC721Burnable {
constructor() constructor()
ERC721Mintable()
ERC721Full("Test", "TEST")
public public
{ {
ERC721Full.initialize("Test", "TEST");
ERC721Mintable.initialize();
} }
} }

7
contracts/token/ERC721/ERC721Mintable.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC721Full.sol"; import "./ERC721Full.sol";
import "../../access/roles/MinterRole.sol"; import "../../access/roles/MinterRole.sol";
@ -8,7 +9,7 @@ import "../../access/roles/MinterRole.sol";
* @title ERC721Mintable * @title ERC721Mintable
* @dev ERC721 minting logic * @dev ERC721 minting logic
*/ */
contract ERC721Mintable is ERC721Full, MinterRole { contract ERC721Mintable is Initializable, ERC721Full, MinterRole {
event MintingFinished(); event MintingFinished();
bool private _mintingFinished = false; bool private _mintingFinished = false;
@ -18,6 +19,10 @@ contract ERC721Mintable is ERC721Full, MinterRole {
_; _;
} }
function initialize() public initializer {
MinterRole.initialize();
}
/** /**
* @return true if the minting is finished. * @return true if the minting is finished.
*/ */