Move standalone ERC20 and ERC721 to token dir (#38)
This commit is contained in:
committed by
Leo Arias
parent
0c05ce0eb1
commit
54268bfeed
@ -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";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,11 +1,11 @@
|
|||||||
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";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -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;
|
||||||
|
|
||||||
Reference in New Issue
Block a user