fix: removed debugging bug from contract

Author: djeelun

.gitignore

@@ -6,6 +6,9 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
+# Truffle build
+block/build/
+
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

block/contracts/GithubVerification.sol

@@ -159,25 +159,16 @@ contract GithubVerification is SignatureHelper {
             }
 
             uint64 verifyDayThreshold = thresholdHistory[currentTimestampIndex].threshold;
-            assert(verifyDayThreshold == 60);
 
-            bool found = false;
             // Reverse for loop, because more recent dates are at the end of the array
             for (uint j = verifiedAt.length; j > 0; j--) {
-                // require(j - 1 == 1, "j==1");
-                // !(verifiedAt[j - 1] + verifyDayThreshold * 1 days > uint64(_timestamp))) {
-                //     revert Bababooey(uint64(_timestamp));
-                // } 
-
                 // If the stamp is valid at _timestamp, add it to the stampsAt array
                 if (verifiedAt[j - 1] + (verifyDayThreshold * 1 days) > _timestamp && verifiedAt[j - 1] < _timestamp) {
-                    if (!found) {
-                        stampsAt[count] = stamps[_toCheck][i];
-                        count++;
-                        found = true;
-                    }
+                    stampsAt[count] = stamps[_toCheck][i];
+                    count++;
+                    break;
                 } else if (verifiedAt[j - 1] + (verifyDayThreshold * 1 days) < _timestamp) {
-                    found = true;
+                    break;
                 }
             }
         }

block/test/GithubVerification.js

@@ -377,7 +377,7 @@ contract("GithubVerification", async (accounts) => {
       * OOOOOO_____OOO_____
       * 
     */
-    xit("Should give correct validity at given timestamp even after verifyDayThreshold change", async () => {
+    it("Should give correct validity at given timestamp even after verifyDayThreshold change", async () => {
       // Create a snapshot we can return to after manually increasing time on the chain
       const snapshotA = await snapshot();
       try {
@@ -428,12 +428,12 @@ contract("GithubVerification", async (accounts) => {
         stamps = await contractInstance.getStampsAt(alice, timestamp + days(VERIFY_DAY_THRESHOLD));
         assert(stamps.length === 0, "Expected address to be invalid at this timestamp; length of stamps array is not equal to 0");
 
-        // stamps = await contractInstance.getStampsAt(alice, newTimestamp + 60);
-        // assert(stamps.length === 1, "Length of stamps array is not equal to 1");
-        // assert(stamps[0][0] === "github", "Provider id should be github");
-        // assert(stamps[0][1] === userHash, "Userhashes not equal");
-        // assert(stamps[0][2][0] == timestamp, "Old timestamps not equal");
-        // assert(stamps[0][2][1] == newTimestamp, "New timestamps not equal");
+        stamps = await contractInstance.getStampsAt(alice, newTimestamp + 60);
+        assert(stamps.length === 1, "Length of stamps array is not equal to 1");
+        assert(stamps[0][0] === "github", "Provider id should be github");
+        assert(stamps[0][1] === userHash, "Userhashes not equal");
+        assert(stamps[0][2][0] == timestamp, "Old timestamps not equal");
+        assert(stamps[0][2][1] == newTimestamp, "New timestamps not equal");
 
         // stamps = await contractInstance.getStampsAt(alice, newTimestamp + VERIFY_DAY_THRESHOLD / 2)
         // assert(stamps.length === 0, "Expected address to be invalid at this timestamp; length of stamps array is not equal to 0");