From 54268bfeed7d1194e31e5664b9e4a17d1dfd4ece Mon Sep 17 00:00:00 2001 From: Facundo Spagnuolo Date: Fri, 19 Oct 2018 19:45:02 +0200 Subject: [PATCH] Move standalone ERC20 and ERC721 to token dir (#38) --- .../{examples => token/ERC20}/StandaloneERC20.sol | 8 ++++---- .../ERC721}/StandaloneERC721.sol | 14 +++++++------- .../ERC20}/StandaloneERC20.test.js | 4 ++-- .../ERC721}/StandaloneERC721.test.js | 0 4 files changed, 13 insertions(+), 13 deletions(-) rename contracts/{examples => token/ERC20}/StandaloneERC20.sol (91%) rename contracts/{examples => token/ERC721}/StandaloneERC721.sol (76%) rename test/{examples => token/ERC20}/StandaloneERC20.test.js (97%) rename test/{examples => token/ERC721}/StandaloneERC721.test.js (100%) diff --git a/contracts/examples/StandaloneERC20.sol b/contracts/token/ERC20/StandaloneERC20.sol similarity index 91% rename from contracts/examples/StandaloneERC20.sol rename to contracts/token/ERC20/StandaloneERC20.sol index bbcf47262..aa15c77c5 100644 --- a/contracts/examples/StandaloneERC20.sol +++ b/contracts/token/ERC20/StandaloneERC20.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.24; import "zos-lib/contracts/Initializable.sol"; -import "../token/ERC20/ERC20Detailed.sol"; -import "../token/ERC20/ERC20Mintable.sol"; -import "../token/ERC20/ERC20Pausable.sol"; +import "./ERC20Detailed.sol"; +import "./ERC20Mintable.sol"; +import "./ERC20Pausable.sol"; /** @@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Pausable.sol"; */ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { 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 ) public initializer { require(initialSupply > 0); diff --git a/contracts/examples/StandaloneERC721.sol b/contracts/token/ERC721/StandaloneERC721.sol similarity index 76% rename from contracts/examples/StandaloneERC721.sol rename to contracts/token/ERC721/StandaloneERC721.sol index 0090387d0..ff499f4f2 100644 --- a/contracts/examples/StandaloneERC721.sol +++ b/contracts/token/ERC721/StandaloneERC721.sol @@ -1,19 +1,19 @@ pragma solidity ^0.4.24; import "zos-lib/contracts/Initializable.sol"; -import "../token/ERC721/ERC721.sol"; -import "../token/ERC721/ERC721Enumerable.sol"; -import "../token/ERC721/ERC721Metadata.sol"; -import "../token/ERC721/ERC721MetadataMintable.sol"; -import "../token/ERC721/ERC721Pausable.sol"; +import "./ERC721.sol"; +import "./ERC721Enumerable.sol"; +import "./ERC721Metadata.sol"; +import "./ERC721MetadataMintable.sol"; +import "./ERC721Pausable.sol"; /** * @title Standard ERC721 token, with minting and pause functionality. * */ -contract StandaloneERC721 - is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable +contract StandaloneERC721 + is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable { function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer { ERC721.initialize(); diff --git a/test/examples/StandaloneERC20.test.js b/test/token/ERC20/StandaloneERC20.test.js similarity index 97% rename from test/examples/StandaloneERC20.test.js rename to test/token/ERC20/StandaloneERC20.test.js index 7d186ca9b..9041094a1 100644 --- a/test/examples/StandaloneERC20.test.js +++ b/test/token/ERC20/StandaloneERC20.test.js @@ -1,6 +1,6 @@ const encodeCall = require('zos-lib/lib/helpers/encodeCall').default; -const { shouldBehaveLikeERC20Mintable } = require('../token/ERC20/behaviors/ERC20Mintable.behavior'); -const { assertRevert } = require('../helpers/assertRevert'); +const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior'); +const { assertRevert } = require('../../helpers/assertRevert'); const BigNumber = web3.BigNumber; diff --git a/test/examples/StandaloneERC721.test.js b/test/token/ERC721/StandaloneERC721.test.js similarity index 100% rename from test/examples/StandaloneERC721.test.js rename to test/token/ERC721/StandaloneERC721.test.js