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

Move standalone ERC20 and ERC721 to token dir (#38)

Browse Source
This commit is contained in:
Facundo Spagnuolo
2018-10-19 19:45:02 +02:00
committed by Leo Arias
parent 0c05ce0eb1
commit 54268bfeed
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/examples/StandaloneERC20.sol → contracts/token/ERC20/StandaloneERC20.sol
View File

@ -1,9 +1,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "zos-lib/contracts/Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC20/ERC20Detailed.sol"; import "./ERC20Detailed.sol";
import "../token/ERC20/ERC20Mintable.sol"; import "./ERC20Mintable.sol";
import "../token/ERC20/ERC20Pausable.sol"; import "./ERC20Pausable.sol";
/** /**
@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Pausable.sol";
*/ */
contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable {
function initialize( function initialize(
string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder, string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder,
address[] minters, address[] pausers address[] minters, address[] pausers
) public initializer { ) public initializer {
require(initialSupply > 0); require(initialSupply > 0);

14
contracts/examples/StandaloneERC721.sol → contracts/token/ERC721/StandaloneERC721.sol
View File

@ -1,19 +1,19 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "zos-lib/contracts/Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC721/ERC721.sol"; import "./ERC721.sol";
import "../token/ERC721/ERC721Enumerable.sol"; import "./ERC721Enumerable.sol";
import "../token/ERC721/ERC721Metadata.sol"; import "./ERC721Metadata.sol";
import "../token/ERC721/ERC721MetadataMintable.sol"; import "./ERC721MetadataMintable.sol";
import "../token/ERC721/ERC721Pausable.sol"; import "./ERC721Pausable.sol";
/** /**
* @title Standard ERC721 token, with minting and pause functionality. * @title Standard ERC721 token, with minting and pause functionality.
* *
*/ */
contract StandaloneERC721 contract StandaloneERC721
is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable
{ {
function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer { function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer {
ERC721.initialize(); ERC721.initialize();

4
test/examples/StandaloneERC20.test.js → test/token/ERC20/StandaloneERC20.test.js
View File

@ -1,6 +1,6 @@
const encodeCall = require('zos-lib/lib/helpers/encodeCall').default; const encodeCall = require('zos-lib/lib/helpers/encodeCall').default;
const { shouldBehaveLikeERC20Mintable } = require('../token/ERC20/behaviors/ERC20Mintable.behavior'); const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior');
const { assertRevert } = require('../helpers/assertRevert'); const { assertRevert } = require('../../helpers/assertRevert');
const BigNumber = web3.BigNumber; const BigNumber = web3.BigNumber;

0
test/examples/StandaloneERC721.test.js → test/token/ERC721/StandaloneERC721.test.js
View File