Separate ERC20 and ERC827 form tokens implementations in contracts an…

…d test folders
klivin · Jan 17, 2018 · b67856c · b67856c
1 parent 4fbd44f
commit b67856c
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 15 deletions.
diff --git a/contracts/lifecycle/TokenDestructible.sol b/contracts/lifecycle/TokenDestructible.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 import "../ownership/Ownable.sol";
-import "../token/ERC20Basic.sol";
+import "../token/ERC20/ERC20Basic.sol";
 
 
 /**

diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 import "../token/StandardToken.sol";
-import "../token/DetailedERC20.sol";
+import "../token/ERC20/DetailedERC20.sol";
 
 
 contract DetailedERC20Mock is StandardToken, DetailedERC20 {

diff --git a/contracts/mocks/ERC827TokenMock.sol b/contracts/mocks/ERC827TokenMock.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.13;
 
 
-import "../token/ERC827Token.sol";
+import "../token/ERC827/ERC827Token.sol";
 
 
 // mock class using ERC827 Token

diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
-import "../token/ERC20.sol";
-import "../token/SafeERC20.sol";
+import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/SafeERC20.sol";
 
 
 contract ERC20FailingMock is ERC20 {

diff --git a/contracts/ownership/CanReclaimToken.sol b/contracts/ownership/CanReclaimToken.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.18;
 
 import "./Ownable.sol";
-import "../token/ERC20Basic.sol";
-import "../token/SafeERC20.sol";
+import "../token/ERC20/ERC20Basic.sol";
+import "../token/ERC20/SafeERC20.sol";
 
 
 /**

diff --git a/contracts/token/BasicToken.sol b/contracts/token/BasicToken.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-import "./ERC20Basic.sol";
+import "./ERC20/ERC20Basic.sol";
 import "../math/SafeMath.sol";
 
 

diff --git a/contracts/token/DetailedERC20.sol → contracts/token/ERC20/DetailedERC20.sol b/contracts/token/DetailedERC20.sol → contracts/token/ERC20/DetailedERC20.sol
diff --git a/contracts/token/ERC20.sol → contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20.sol → contracts/token/ERC20/ERC20.sol
diff --git a/contracts/token/ERC20Basic.sol → contracts/token/ERC20/ERC20Basic.sol b/contracts/token/ERC20Basic.sol → contracts/token/ERC20/ERC20Basic.sol
diff --git a/contracts/token/SafeERC20.sol → contracts/token/ERC20/SafeERC20.sol b/contracts/token/SafeERC20.sol → contracts/token/ERC20/SafeERC20.sol
diff --git a/contracts/token/ERC827.sol → contracts/token/ERC827/ERC827.sol b/contracts/token/ERC827.sol → contracts/token/ERC827/ERC827.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.13;
 
 
-import "./ERC20.sol";
+import "../ERC20/ERC20.sol";
 
 
 /**

diff --git a/contracts/token/ERC827Token.sol → contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827Token.sol → contracts/token/ERC827/ERC827Token.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.13;
 
 import "./ERC827.sol";
-import "./StandardToken.sol";
+import "../StandardToken.sol";
 
 /**
    @title ERC827, an extension of ERC20 token standard

diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.4.18;
 
 
 import "./BasicToken.sol";
-import "./ERC20.sol";
+import "./ERC20/ERC20.sol";
 
 
 /**

diff --git a/contracts/token/TokenTimelock.sol b/contracts/token/TokenTimelock.sol
@@ -1,7 +1,6 @@
 pragma solidity ^0.4.18;
 
-import "./ERC20Basic.sol";
-import "../token/SafeERC20.sol";
+import "./ERC20/SafeERC20.sol";
 
 
 /**

diff --git a/contracts/token/TokenVesting.sol b/contracts/token/TokenVesting.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
-import "./ERC20Basic.sol";
-import "./SafeERC20.sol";
+import "./ERC20/ERC20Basic.sol";
+import "./ERC20/SafeERC20.sol";
 import "../ownership/Ownable.sol";
 import "../math/SafeMath.sol";
 

diff --git a/test/token/erc/DetailedERC20.test.js → test/token/ERC20/DetailedERC20.test.js b/test/token/erc/DetailedERC20.test.js → test/token/ERC20/DetailedERC20.test.js
diff --git a/test/token/erc/SafeERC20.test.js → test/token/ERC20/SafeERC20.test.js b/test/token/erc/SafeERC20.test.js → test/token/ERC20/SafeERC20.test.js
diff --git a/test/token/erc/ERC827Token.js → test/token/ERC827/ERC827Token.js b/test/token/erc/ERC827Token.js → test/token/ERC827/ERC827Token.js