frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Results return Error enum instead of String

Browse Source
This commit is contained in:
Steve Myers 2021-06-22 16:49:25 -07:00
parent d248bca299
commit c921120216
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bdk-kotlin/jvm/src/main/java/org/bitcoindevkit/bdk/StringResult.kt
View File

@ -11,11 +11,11 @@ class StringResult internal constructor(private val stringResultT: LibJna.String
return libJna.get_string_err(stringResultT) != null return libJna.get_string_err(stringResultT) != null
} }
fun err(): String? { fun err(): Error? {
val errPointer = libJna.get_string_err(stringResultT) val errPointer = libJna.get_string_err(stringResultT)
val err = errPointer?.getString(0) val err = errPointer?.getString(0)
libJna.free_string(errPointer) libJna.free_string(errPointer)
return err return err?.let { Error.valueOf(it) }
} }
fun ok(): String? { fun ok(): String? {

4
bdk-kotlin/jvm/src/main/java/org/bitcoindevkit/bdk/VoidResult.kt
View File

@ -11,11 +11,11 @@ class VoidResult internal constructor(private val voidResultT: LibJna.VoidResult
return libJna.get_void_err(voidResultT) != null return libJna.get_void_err(voidResultT) != null
} }
fun err(): String? { fun err(): Error? {
val errPointer = libJna.get_void_err(voidResultT) val errPointer = libJna.get_void_err(voidResultT)
val err = errPointer?.getString(0) val err = errPointer?.getString(0)
libJna.free_string(errPointer) libJna.free_string(errPointer)
return err return err?.let { Error.valueOf(it) }
} }
protected fun finalize() { protected fun finalize() {

4
bdk-kotlin/jvm/src/main/java/org/bitcoindevkit/bdk/WalletResult.kt
View File

@ -16,11 +16,11 @@ class WalletResult(
return libJna.get_wallet_err(walletResultT) != null return libJna.get_wallet_err(walletResultT) != null
} }
fun err(): String? { fun err(): Error? {
val errPointer = libJna.get_wallet_err(walletResultT) val errPointer = libJna.get_wallet_err(walletResultT)
val err = errPointer?.getString(0) val err = errPointer?.getString(0)
libJna.free_string(errPointer) libJna.free_string(errPointer)
return err return err?.let { Error.valueOf(it) }
} }
fun ok(): Wallet? { fun ok(): Wallet? {

2
bdk-kotlin/test-fixtures/src/main/java/org/bitcoindevkit/bdk/LibTest.kt
View File

@ -26,7 +26,7 @@ abstract class LibTest : LibBase() {
val walletErr = badWalletResult.err() val walletErr = badWalletResult.err()
assertNotNull(walletErr) assertNotNull(walletErr)
log.debug("wallet error $walletErr") log.debug("wallet error $walletErr")
assertEquals("Descriptor", walletErr) assertEquals(Error.Descriptor, walletErr)
val wallet = badWalletResult.ok() val wallet = badWalletResult.ok()
assertNull(wallet) assertNull(wallet)
} }