Browse Source

Merge pull request #2 from zcash/hotfix/conversion-error

Fix: Conversion to list.
master
Kevin Gorham 4 years ago
committed by GitHub
parent
commit
a4fc849111
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
  2. 2
      lib/publish.gradle
  3. 2
      lib/src/main/java/cash/z/ecc/android/bip39/Mnemonics.kt
  4. 5
      lib/src/test/java/cash/z/ecc/android/bip39/MnemonicsTest.kt

3
buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt

@ -6,9 +6,10 @@ object Deps {
const val kotlinVersion = "1.3.72"
const val group = "cash.z.ecc.android"
const val artifactName = "kotlin-bip39"
const val versionName = "1.0.0-beta08"
const val versionName = "1.0.0-beta09"
const val description = "A concise implementation of BIP-0039 in Kotlin for Android."
const val githubUrl = "https://github.com/zcash/kotlin-bip39"
const val publishingActive = false // set to true to activate bintrayUpload task
object Kotlin : Version(kotlinVersion) {
val STDLIB = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"

2
lib/publish.gradle

@ -78,7 +78,7 @@ bintray {
userOrg = 'ecc-mobile'
licenses = ['MIT']
vcsUrl = Deps.githubUrl
dryRun = true
dryRun = !Deps.publishingActive
version {
name = Deps.versionName
desc = Deps.description

2
lib/src/main/java/cash/z/ecc/android/bip39/Mnemonics.kt

@ -72,7 +72,7 @@ object Mnemonics {
var cursor = 0
chars.forEachIndexed { i, c ->
if (c == ' ' || i == chars.lastIndex) {
add(chars.copyOfRange(cursor, if (chars[i].isWhitespace()) i else i - 1))
add(chars.copyOfRange(cursor, if (chars[i].isWhitespace()) i else i + 1))
cursor = i + 1
}
}

5
lib/src/test/java/cash/z/ecc/android/bip39/MnemonicsTest.kt

@ -11,6 +11,7 @@ import io.kotest.assertions.throwables.shouldThrow
import io.kotest.core.spec.style.BehaviorSpec
import io.kotest.data.forAll
import io.kotest.data.row
import io.kotest.matchers.collections.shouldContainAll
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
import io.kotest.matchers.string.shouldContain
@ -81,8 +82,8 @@ class MnemonicsTest : BehaviorSpec({
words.size shouldBe wordCount.count
}
Then("Each word is present in the original phrase") {
words.forEach {
phraseString shouldContain "$it"
phraseString.split(' ').let { correctWords ->
words.shouldContainAll(correctWords)
}
}
}

Loading…
Cancel
Save