Remove hashes and ripemd160 module and replace with org.komputing.khash

komputing · Nov 12, 2019 · fc287df · fc287df
1 parent 9b4e405
commit fc287df
Show file tree

Hide file tree

Showing 23 changed files with 19 additions and 1,057 deletions.
diff --git a/base58/build.gradle b/base58/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    implementation project(path: ':hashes')
-    testImplementation "com.github.komputing:khex:$khex_version"
+    implementation "com.github.komputing.khash:sha256:$khash_version"
 
+    testImplementation "com.github.komputing:khex:$khex_version"
 }
diff --git a/base58/src/main/kotlin/org/kethereum/encodings/Base58.kt b/base58/src/main/kotlin/org/kethereum/encodings/Base58.kt
@@ -2,6 +2,8 @@
 
 package org.kethereum.encodings
 
+import org.komputing.khash.sha256.extensions.sha256
+
 /**
  * Base58 is a way to encode addresses (or arbitrary data) as alphanumeric strings.
  * Compared to base64, this encoding eliminates ambiguities created by O0Il and potential splits from punctuation
@@ -16,7 +18,6 @@ package org.kethereum.encodings
  *
  */
 
-import org.kethereum.hashes.sha256
 
 private const val ENCODED_ZERO = '1'
 private const val CHECKSUM_SIZE = 4

diff --git a/bip32/build.gradle b/bip32/build.gradle
@@ -3,10 +3,12 @@ dependencies {
     implementation project(path: ':base58')
     implementation project(path: ':crypto')
     implementation project(path: ':crypto_api')
-    implementation project(path: ':hashes')
     implementation project(path: ':extensions')
     implementation project(path: ':model')
 
+    implementation "com.github.komputing.khash:sha256:$khash_version"
+    implementation "com.github.komputing.khash:ripemd160:$khash_version"
+
     testImplementation "com.github.komputing:khex:$khex_version"
     testImplementation project(path: ':crypto_impl_bouncycastle')
 

diff --git a/bip32/src/main/kotlin/org/kethereum/bip32/BIP32.kt b/bip32/src/main/kotlin/org/kethereum/bip32/BIP32.kt
@@ -9,11 +9,11 @@ import org.kethereum.bip44.BIP44
 import org.kethereum.bip44.BIP44Element
 import org.kethereum.crypto.*
 import org.kethereum.extensions.toBytesPadded
-import org.kethereum.hashes.ripemd160
-import org.kethereum.hashes.sha256
 import org.kethereum.model.ECKeyPair
 import org.kethereum.model.PRIVATE_KEY_SIZE
 import org.kethereum.model.PrivateKey
+import org.komputing.khash.ripemd160.extensions.digestRipemd160
+import org.komputing.khash.sha256.extensions.sha256
 import java.math.BigInteger
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -35,7 +35,7 @@ fun Seed.toKey(pathString: String, testnet: Boolean = false) = BIP44(pathString)
 private fun ECKeyPair.computeFingerPrint(): Int {
     val pubKeyHash = getCompressedPublicKey()
             .sha256()
-            .ripemd160()
+            .digestRipemd160()
     var fingerprint = 0
     for (i in 0..3) {
         fingerprint = fingerprint shl 8

diff --git a/bip39/build.gradle b/bip39/build.gradle
@@ -1,11 +1,11 @@
 dependencies {
     implementation project(path: ':bip32')
     implementation project(path: ':extensions')
-    implementation project(path: ':hashes')
     implementation project(path: ':crypto')
     implementation project(path: ':crypto_api')
 
     implementation "com.github.komputing:khex:$khex_version"
+    implementation "com.github.komputing.khash:sha256:$khash_version"
 
     testImplementation project(path: ':bip39_wordlist_en')
     testImplementation project(path: ':crypto_impl_spongycastle')

diff --git a/bip39/src/main/kotlin/org/kethereum/bip39/Mnemonic.kt b/bip39/src/main/kotlin/org/kethereum/bip39/Mnemonic.kt
@@ -6,7 +6,7 @@ import org.kethereum.bip39.model.MnemonicWords
 import org.kethereum.crypto.CryptoAPI
 import org.kethereum.extensions.toBitArray
 import org.kethereum.extensions.toByteArray
-import org.kethereum.hashes.sha256
+import org.komputing.khash.sha256.extensions.sha256
 import java.security.SecureRandom
 import java.util.*
 

diff --git a/bloomfilter/build.gradle b/bloomfilter/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation project(":hashes")
+    implementation "com.github.komputing.khash:sha256:$khash_version"
 }
diff --git a/bloomfilter/src/main/kotlin/org/kethereum/bloomfilter/BloomFilter.kt b/bloomfilter/src/main/kotlin/org/kethereum/bloomfilter/BloomFilter.kt
@@ -1,8 +1,8 @@
 package org.kethereum.bloomfilter
 
-import org.kethereum.hashes.sha256
+import org.komputing.khash.sha256.extensions.sha256
 import java.math.BigInteger
-import java.util.BitSet
+import java.util.*
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
 import kotlin.concurrent.write

diff --git a/crypto/build.gradle b/crypto/build.gradle
@@ -2,14 +2,14 @@ dependencies {
     implementation project(":model")
     implementation project(":functions")
     implementation project(":keccak_shortcut")
-    implementation project(":hashes")
     implementation project(":extensions")
     implementation project(":crypto_api")
-    
+
     implementation "com.github.komputing:khex:$khex_version"
 
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
 
-    implementation project(":test_data")
+    testImplementation project(":test_data")
+    testImplementation "com.github.komputing.khash:sha256:$khash_version"
     testImplementation project(":crypto_impl_spongycastle")
 }
diff --git a/crypto/src/test/kotlin/org/kethereum/crypto/SignTest.kt b/crypto/src/test/kotlin/org/kethereum/crypto/SignTest.kt
@@ -7,9 +7,9 @@ import org.kethereum.crypto.test_data.PRIVATE_KEY
 import org.kethereum.crypto.test_data.PUBLIC_KEY
 import org.kethereum.crypto.test_data.TEST_MESSAGE
 import org.kethereum.extensions.hexToBigInteger
-import org.kethereum.hashes.sha256
 import org.kethereum.model.PrivateKey
 import org.kethereum.model.SignatureData
+import org.komputing.khash.sha256.extensions.sha256
 import org.walleth.khex.hexToByteArray
 import java.security.SignatureException
 

diff --git a/hashes/.gitignore b/hashes/.gitignore
diff --git a/hashes/build.gradle b/hashes/build.gradle
diff --git a/hashes/src/main/kotlin/org/kethereum/hashes/ArrayExtensions.kt b/hashes/src/main/kotlin/org/kethereum/hashes/ArrayExtensions.kt
diff --git a/hashes/src/main/kotlin/org/kethereum/hashes/ByteExtensions.kt b/hashes/src/main/kotlin/org/kethereum/hashes/ByteExtensions.kt
diff --git a/hashes/src/main/kotlin/org/kethereum/hashes/Hashes.kt b/hashes/src/main/kotlin/org/kethereum/hashes/Hashes.kt
diff --git a/hashes/src/main/kotlin/org/kethereum/hashes/IntExtensions.kt b/hashes/src/main/kotlin/org/kethereum/hashes/IntExtensions.kt