Move all dependencies to lib directory and make interface contracts i…

…nterface types (#193)

* Move all dependencies to new lib directory that is skipped from coverage metrics

* Make interface contracts interface types

* Update solidity-coverage to 0.3.8

.solcover.js

@@ -1,6 +1,9 @@
+const files = require('glob').sync('contracts/lib/**/*.sol').map(n => n.replace('contracts/', ''))
+
 module.exports = {
     norpc: true,
+    compileCommand: '../node_modules/.bin/truffle compile',
     testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
-    skipFiles: ['zeppelin/math/Math.sol', 'zeppelin/math/SafeMath.sol', 'misc/Migrations.sol', 'ens/*ENS.sol', 'ens/PublicResolver.sol'],
+    skipFiles: ['common/IForwarder.sol', 'kernel/IKernel.sol'].concat(files),
     copyNodeModules: true,
 }

.soliumignore

@@ -1,4 +1,2 @@
 node_modules
-contracts/zeppelin
-contracts/factories/BaseFactory.sol
-contracts/kernel/IKernel.sol
+contracts/lib

contracts/apm/APMRegistry.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.18;
 
 import "../kernel/Kernel.sol";
-import "../ens/AbstractENS.sol";
+import "../lib/ens/AbstractENS.sol";
 import "../ens/ENSSubdomainRegistrar.sol";
 import "../apps/AppProxyFactory.sol";
 import "../apps/AragonApp.sol";

contracts/common/EtherToken.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.18;
 
-import "./erc677/ERC677Token.sol";
+import "../lib/erc677/ERC677Token.sol";
 
 
 contract EtherToken is ERC677Token {

contracts/common/IForwarder.sol

@@ -1,9 +1,8 @@
 pragma solidity ^0.4.18;
 
 
-contract IForwarder {
-    function isForwarder() public pure returns (bool) { return true; }
-
+interface IForwarder {
+    function isForwarder() public pure returns (bool);
     function canForward(address _sender, bytes _evmCallScript) public view returns (bool);
     function forward(bytes _evmCallScript) public;
 }

contracts/ens/ENSSubdomainRegistrar.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.18;
 
-import "./AbstractENS.sol";
-import "./PublicResolver.sol";
+import "../lib/ens/AbstractENS.sol";
+import "../lib/ens/PublicResolver.sol";
 import "./ENSConstants.sol";
 
 import "../apps/AragonApp.sol";

contracts/factory/ENSFactory.sol

@@ -1,8 +1,8 @@
 pragma solidity 0.4.18;
 
-import "../ens/ENS.sol";
+import "../lib/ens/ENS.sol";
+import "../lib/ens/PublicResolver.sol";
 import "../ens/ENSSubdomainRegistrar.sol";
-import "../ens/PublicResolver.sol";
 
 
 contract ENSFactory is ENSConstants {

contracts/kernel/IKernel.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 
-contract IKernel {
+interface IKernel {
     event SetPermission(address indexed entity, address indexed app, bytes32 indexed role, bool allowed);
     event ChangePermissionManager(address indexed app, bytes32 indexed role, address indexed manager);
     event UpgradeKernel(address indexed newKernel);

contracts/kernel/Kernel.sol

@@ -3,7 +3,6 @@ pragma solidity 0.4.18;
 import "./IKernel.sol";
 import "./KernelStorage.sol";
 import "../common/Initializable.sol";
-import "../zeppelin/math/SafeMath.sol";
 
 
 contract Kernel is IKernel, KernelStorage, Initializable {

contracts/ens/AbstractENS.sol → contracts/lib/ens/AbstractENS.sol

@@ -1,8 +1,7 @@
 pragma solidity ^0.4.15;
 
-/* solium-disable */
 
-contract AbstractENS {
+interface AbstractENS {
     function owner(bytes32 _node) constant returns (address);
     function resolver(bytes32 _node) constant returns (address);
     function ttl(bytes32 _node) constant returns (uint64);

contracts/ens/ENS.sol → contracts/lib/ens/ENS.sol

@@ -1,6 +1,5 @@
 pragma solidity ^0.4.0;
 
-/* solium-disable */
 
 import './AbstractENS.sol';
 

contracts/ens/PublicResolver.sol → contracts/lib/ens/PublicResolver.sol

@@ -1,7 +1,5 @@
 pragma solidity ^0.4.0;
 
-/* solium-disable */
-
 import './AbstractENS.sol';
 
 /**

contracts/common/erc677/ERC677Receiver.sol → contracts/lib/erc677/ERC677Receiver.sol

@@ -1,6 +1,5 @@
 pragma solidity 0.4.18;
 
-/* solium-disable */
 
 contract ERC677Receiver {
     function tokenFallback(address from, uint256 amount, bytes data) external returns (bool success);

contracts/common/erc677/ERC677Token.sol → contracts/lib/erc677/ERC677Token.sol

@@ -1,9 +1,8 @@
 pragma solidity 0.4.18;
 
-/* solium-disable */
 
 import "./ERC677Receiver.sol";
-import "../../zeppelin/token/StandardToken.sol";
+import "../zeppelin/token/StandardToken.sol";
 
 contract ERC677Token is StandardToken {
     function transferAndCall(address receiver, uint amount, bytes data) public returns (bool success) {

contracts/common/TokenController.sol → contracts/lib/minime/ITokenController.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.4.18;
 /// @dev The token controller contract must implement these functions
 
 
-contract TokenController {
+interface ITokenController {
     /// @notice Called when `_owner` sends ether to the MiniMe Token contract
     /// @param _owner The address that sent the ether to create tokens
     /// @return True if the ether is accepted, false if it throws

contracts/common/MiniMeToken.sol → contracts/lib/minime/MiniMeToken.sol

@@ -1,7 +1,5 @@
 pragma solidity ^0.4.6;
 
-/* solium-disable */
-
 /*
     Copyright 2016, Jordi Baylina
 
@@ -27,7 +25,7 @@ pragma solidity ^0.4.6;
 ///  affecting the original token
 /// @dev It is ERC20 compliant, but still needs to under go further testing.
 
-import "./TokenController.sol";
+import "./ITokenController.sol";
 
 contract Controlled {
     /// @notice The address of the controller is the only address that can call
@@ -204,7 +202,7 @@ contract MiniMeToken is Controlled {
         // Alerts the token controller of the transfer
         if (isContract(controller)) {
             // Adding the ` == true` makes the linter shut up so...
-            require(TokenController(controller).onTransfer(_from, _to, _amount) == true);
+            require(ITokenController(controller).onTransfer(_from, _to, _amount) == true);
         }
         // First update the balance array with the new value for the address
         //  sending the tokens
@@ -243,7 +241,7 @@ contract MiniMeToken is Controlled {
         // Alerts the token controller of the approve function call
         if (isContract(controller)) {
             // Adding the ` == true` makes the linter shut up so...
-            require(TokenController(controller).onApprove(msg.sender, _spender, _amount) == true);
+            require(ITokenController(controller).onApprove(msg.sender, _spender, _amount) == true);
         }
 
         allowed[msg.sender][_spender] = _amount;
@@ -498,7 +496,7 @@ contract MiniMeToken is Controlled {
     function ()  payable  public {
         require(isContract(controller));
         // Adding the ` == true` makes the linter shut up so...
-        require(TokenController(controller).proxyPayment.value(msg.value)(msg.sender) == true);
+        require(ITokenController(controller).proxyPayment.value(msg.value)(msg.sender) == true);
     }
 
 //////////

contracts/misc/Migrations.sol → contracts/lib/misc/Migrations.sol

@@ -1,7 +1,5 @@
 pragma solidity ^0.4.2;
 
-/* solium-disable */
-
 
 contract Migrations {
     address public owner;