Merge branch 'dev'

falkecarlsen · May 29, 2018 · 422f68b · 422f68b
2 parents e3cbd70 + 75b657c
commit 422f68b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 52 deletions.
diff --git a/datchain/.idea/misc.xml b/datchain/.idea/misc.xml
diff --git a/datchain/.idea/modules.xml b/datchain/.idea/modules.xml
diff --git a/datchain/datchain.iml b/datchain/datchain.iml
diff --git a/datchain/src/dk/aau/cs/a311c/datchain/Block.java b/datchain/src/dk/aau/cs/a311c/datchain/Block.java
@@ -70,6 +70,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(getIdentity(), getIdentityDOB(), getIdentityPublicKey(), getPrevHash(), getHash(), getTimestamp());
     }
-}
-
-
+}
diff --git a/datchain/src/dk/aau/cs/a311c/datchain/cryptography/SHA.java b/datchain/src/dk/aau/cs/a311c/datchain/cryptography/SHA.java
@@ -15,7 +15,6 @@ public static String computeHash(String hashInput) {
         } catch (NoSuchAlgorithmException e) {
             System.out.println("ERROR: System does not support cryptographic hash algorithm: " + e.getMessage());
         }
-        //TODO might be redundant or not proper error-handling
         assert messageDigest != null;
 
         //get hashInput as bytes and update messageDigest