meta-txs: ignore relayer contracts for coverage measure

aragon · May 17, 2019 · 3b91caa · 3b91caa
1 parent f092d3b
commit 3b91caa
Show file tree

Hide file tree

Showing 4 changed files with 572 additions and 570 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -2,9 +2,11 @@ const skipFiles = [
   'lib',
   'test',
   'acl/ACLSyntaxSugar.sol',
-  'common/DepositableStorage.sol', // Used in tests that send ETH
-  'common/SafeERC20.sol', // solidity-coverage fails on assembly if (https://github.com/sc-forks/solidity-coverage/issues/287)
-  'common/UnstructuredStorage.sol' // Used in tests that send ETH
+  'common/DepositableStorage.sol',  // Used in tests that send ETH
+  'common/SafeERC20.sol',           // solidity-coverage fails on assembly if (https://github.com/sc-forks/solidity-coverage/issues/287)
+  'common/UnstructuredStorage.sol', // Used in tests that send ETH
+  'relayer/Relayer.sol',            // solidity-coverage uses test-rpc which does not implement eth_signTypedData
+  'relayer/RelayedAragonApp.sol'    // solidity-coverage uses test-rpc which does not implement eth_signTypedData
 ]
 
 module.exports = {

diff --git a/contracts/relayer/Relayer.sol b/contracts/relayer/Relayer.sol
@@ -6,8 +6,6 @@ import "../lib/sig/ECDSA.sol";
 import "../lib/misc/EIP712.sol";
 import "../lib/math/SafeMath.sol";
 import "../apps/AragonApp.sol";
-import "../common/IsContract.sol";
-import "../common/TimeHelpers.sol";
 import "../common/MemoryHelpers.sol";
 import "../common/DepositableStorage.sol";