Updated tests for better coverage

uport-project · Jul 13, 2017 · f3f7ebd · f3f7ebd
1 parent b840ed9
commit f3f7ebd
Show file tree

Hide file tree

Showing 38 changed files with 328 additions and 630 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -1,5 +1,6 @@
 module.exports = {
   port: 8555,
   testCommand: 'sleep 5 && ../node_modules/.bin/truffle test --network coverage',
-  accounts: 25
+  accounts: 25,
+  skipFiles: ['misc/Migrations.sol']
 };
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # uPort Identity Contracts
 [![npm](https://img.shields.io/npm/v/npm.svg)](https://www.npmjs.com/package/uport-identity)
 ![CircleCI](https://img.shields.io/circleci/project/github/uport-project/uport-identity.svg)
-[![solidity-coverage](https://img.shields.io/badge/coverage-92.86%25-green.svg)](https://uport-project.github.io/uport-identity/coverage)
+[![solidity-coverage](https://img.shields.io/badge/coverage-96.64%25-green.svg)](https://uport-project.github.io/uport-identity/coverage)
 
 Please read our [Whitepaper](http://whitepaper.uport.me) for information on what uPort is, and what is currently possible as far as integration.
 

diff --git a/contracts/misc/MetaTestRegistry.sol b/contracts/misc/MetaTestRegistry.sol
@@ -10,10 +10,6 @@ contract MetaTestRegistry {
     registry[sender] = x;
   }
 
-  function reallyLongFunctionName(uint with, address many, string strange, uint params) {
-    registry[many] = params;
-  }
-
   function testThrow(address sender) {
       throw;
   }

diff --git a/docs/coverage/contracts/IdentityFactory.sol.html b/docs/coverage/contracts/IdentityFactory.sol.html
@@ -124,7 +124,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/IdentityFactoryWithRecoveryKey.sol.html b/docs/coverage/contracts/IdentityFactoryWithRecoveryKey.sol.html
@@ -127,7 +127,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/IdentityManager.sol.html b/docs/coverage/contracts/IdentityManager.sol.html
@@ -20,14 +20,14 @@ <h1>
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">88.64% </span>
+        <span class="strong">97.73% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>39/44</span>
+        <span class='fraction'>43/44</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">70% </span>
+        <span class="strong">90% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>14/20</span>
+        <span class='fraction'>18/20</span>
       </div>
       <div class='fl pad1y space-right2'>
         <span class="strong">100% </span>
@@ -312,34 +312,34 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">134×</span>
+<span class="cline-any cline-yes">142×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25×</span>
+<span class="cline-any cline-yes">26×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">93×</span>
+<span class="cline-any cline-yes">95×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15×</span>
+<span class="cline-any cline-yes">20×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">77×</span>
-<span class="cline-any cline-yes">63×</span>
-<span class="cline-any cline-yes">63×</span>
+<span class="cline-any cline-yes">83×</span>
+<span class="cline-any cline-yes">69×</span>
+<span class="cline-any cline-yes">69×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">69×</span>
+<span class="cline-any cline-yes">75×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -349,21 +349,21 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">46×</span>
-<span class="cline-any cline-yes">46×</span>
-<span class="cline-any cline-yes">46×</span>
-<span class="cline-any cline-yes">46×</span>
+<span class="cline-any cline-yes">47×</span>
+<span class="cline-any cline-yes">47×</span>
+<span class="cline-any cline-yes">47×</span>
+<span class="cline-any cline-yes">47×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">61×</span>
+<span class="cline-any cline-yes">65×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">61×</span>
-<span class="cline-any cline-yes">61×</span>
+<span class="cline-any cline-yes">65×</span>
+<span class="cline-any cline-yes">65×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -382,7 +382,7 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">14×</span>
+<span class="cline-any cline-yes">15×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -391,8 +391,8 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38×</span>
-<span class="cline-any cline-yes">38×</span>
+<span class="cline-any cline-yes">39×</span>
+<span class="cline-any cline-yes">39×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -401,9 +401,9 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">13×</span>
-<span class="cline-any cline-yes">13×</span>
-<span class="cline-any cline-yes">13×</span>
+<span class="cline-any cline-yes">17×</span>
+<span class="cline-any cline-yes">16×</span>
+<span class="cline-any cline-yes">16×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -458,8 +458,8 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">69×</span>
-<span class="cline-any cline-yes">69×</span>
+<span class="cline-any cline-yes">77×</span>
+<span class="cline-any cline-yes">77×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -538,8 +538,8 @@ <h1>
   }
 &nbsp;
   modifier onlyRecovery(address identity, address sender) {
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (recoveryKeys[identity] == sender) _;
-    else <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (recoveryKeys[identity] == sender) _;
+    else throw;
   }
 &nbsp;
   modifier rateLimited(Proxy identity, address sender) {
@@ -550,8 +550,8 @@ <h1>
   }
 &nbsp;
   modifier validRecovery(address newKey) { //protects against some weird attacks
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (newKey != address(0)) _;
-    else <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (newKey != address(0)) _;
+    else throw;
   }
 &nbsp;
   /// @dev Contract constructor sets initial timelocks and meta-tx relay address
@@ -582,7 +582,7 @@ <h1>
   /// @param recoveryKey Key of recovery network or address from seed to recovery proxy
   /// Note: User must change owner of proxy to this contract after calling this
   function registerIdentity(address owner, address recoveryKey) validRecovery(recoveryKey) {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (recoveryKeys[msg.sender] &gt; 0 ) <span class="cstat-no" title="statement not covered" >throw;</span> // Invariant enforced w/ validRecovery modifier
+    if (recoveryKeys[msg.sender] &gt; 0 ) throw; // Invariant enforced w/ validRecovery modifier
     owners[msg.sender][owner] = now - adminTimeLock; // Owner has full power from day one
     recoveryKeys[msg.sender] = recoveryKey;
     IdentityCreated(msg.sender, msg.sender, owner, recoveryKey);
@@ -612,7 +612,7 @@ <h1>
     onlyRecovery(identity, sender)
     rateLimited(identity, sender)
   {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (owners[identity][newOwner] &gt; 0) <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (owners[identity][newOwner] &gt; 0) throw;
     owners[identity][newOwner] = now;
     OwnerAdded(identity, newOwner, sender);
   }
@@ -682,7 +682,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/Proxy.sol.html b/docs/coverage/contracts/Proxy.sol.html
@@ -71,8 +71,8 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">27×</span>
-<span class="cline-any cline-yes">4×</span>
+<span class="cline-any cline-yes">28×</span>
+<span class="cline-any cline-yes">5×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">23×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -100,7 +100,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/RecoverableController.sol.html b/docs/coverage/contracts/RecoverableController.sol.html
@@ -331,7 +331,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/RecoveryQuorum.sol.html b/docs/coverage/contracts/RecoveryQuorum.sol.html
@@ -484,7 +484,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/TxRelay.sol.html b/docs/coverage/contracts/TxRelay.sol.html
@@ -232,7 +232,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/index.html b/docs/coverage/contracts/index.html
@@ -20,14 +20,14 @@ <h1>
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">96.18% </span>
+        <span class="strong">99.24% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>126/131</span>
+        <span class='fraction'>130/131</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">88.33% </span>
+        <span class="strong">95% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>53/60</span>
+        <span class='fraction'>57/60</span>
       </div>
       <div class='fl pad1y space-right2'>
         <span class="strong">100% </span>
@@ -86,11 +86,11 @@ <h1>
 
 <tr>
 	<td class="file high" data-value="IdentityManager.sol"><a href="IdentityManager.sol.html">IdentityManager.sol</a></td>
-	<td data-value="88.64" class="pic high"><div class="chart"><div class="cover-fill" style="width: 88%;"></div><div class="cover-empty" style="width:12%;"></div></div></td>
-	<td data-value="88.64" class="pct high">88.64%</td>
-	<td data-value="44" class="abs high">39/44</td>
-	<td data-value="70" class="pct medium">70%</td>
-	<td data-value="20" class="abs medium">14/20</td>
+	<td data-value="97.73" class="pic high"><div class="chart"><div class="cover-fill" style="width: 97%;"></div><div class="cover-empty" style="width:3%;"></div></div></td>
+	<td data-value="97.73" class="pct high">97.73%</td>
+	<td data-value="44" class="abs high">43/44</td>
+	<td data-value="90" class="pct high">90%</td>
+	<td data-value="20" class="abs high">18/20</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="18" class="abs high">18/18</td>
 	<td data-value="100" class="pct high">100%</td>
@@ -155,7 +155,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/libs/ArrayLib.sol.html b/docs/coverage/contracts/libs/ArrayLib.sol.html
@@ -109,7 +109,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../../prettify.js"></script>

diff --git a/docs/coverage/contracts/libs/Owned.sol.html b/docs/coverage/contracts/libs/Owned.sol.html
@@ -71,10 +71,10 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">45×</span>
+<span class="cline-any cline-yes">46×</span>
 <span class="cline-any cline-yes">3×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">42×</span>
+<span class="cline-any cline-yes">43×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -115,7 +115,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../../prettify.js"></script>

diff --git a/docs/coverage/contracts/libs/index.html b/docs/coverage/contracts/libs/index.html
@@ -90,7 +90,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 12 2017 19:00:39 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 13 2017 17:20:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../../prettify.js"></script>