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

Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3

Browse Source
This commit is contained in:
Nicolás Venturo
2018-10-04 12:00:12 -03:00
parent 3df0a786e4 2d30918149
commit f29e98f772
19 changed files with 187 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/mocks/ERC721FullMock.sol
View File

@ -3,15 +3,16 @@ pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721MetadataMintable.sol";
import "../token/ERC721/ERC721Burnable.sol";
/**
* @title ERC721Mock
* @title ERC721FullMock
* This mock just provides a public mint and burn functions for testing purposes,
* and a public setter for metadata URI
*/
contract ERC721FullMock is Initializable, ERC721Full, ERC721Mintable, ERC721Burnable {
contract ERC721FullMock is Initializable, ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
constructor(string name, string symbol) public
{
ERC721Full.initialize(name, symbol);

3
contracts/mocks/ERC721MintableBurnableImpl.sol
View File

@ -3,6 +3,7 @@ pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721MetadataMintable.sol";
import "../token/ERC721/ERC721Burnable.sol";
@ -10,7 +11,7 @@ import "../token/ERC721/ERC721Burnable.sol";
* @title ERC721MintableBurnableImpl
*/
contract ERC721MintableBurnableImpl
is Initializable, ERC721Full, ERC721Mintable, ERC721Burnable {
is Initializable, ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
constructor()
public

7
contracts/mocks/SignatureBouncerMock.sol
View File

@ -69,4 +69,11 @@ contract SignatureBouncerMock is Initializable, SignatureBouncer, SignerRoleMock
{
}
function tooShortMsgData()
public
onlyValidSignatureAndData("")
view
{
}
}