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

Add FfiResultVoid type

Browse Source
This commit is contained in:
Steve Myers
2021-07-03 19:24:29 -07:00
parent d00cc73261
commit 8443265142
6 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bdk-kotlin/jvm/src/main/kotlin/org/bitcoindevkit/bdk/LibJna.kt
View File

@@ -30,27 +30,22 @@ interface LibJna : Library {
// typedef struct {
//
// int32_t ok;
//
// char * err;
//
//} FfiResult_int32_t;
open class FfiResult_int32_t : Structure() {
class ByValue : FfiResult_int32_t(), Structure.ByValue
class ByReference : FfiResult_int32_t(), Structure.ByReference
@JvmField
var ok: Int = 0
//} FfiResultVoid_t;
open class FfiResultVoid_t : Structure() {
class ByValue : FfiResultVoid_t(), Structure.ByValue
class ByReference : FfiResultVoid_t(), Structure.ByReference
@JvmField
var err: String = ""
override fun getFieldOrder() = listOf("ok", "err")
override fun getFieldOrder() = listOf("err")
}
// void free_int_result (
// FfiResult_int32_t int_result);
fun free_int_result(void_result: FfiResult_int32_t.ByValue)
// void free_void_result (
// FfiResultVoid_t void_result);
fun free_void_result(void_result: FfiResultVoid_t.ByValue)
// void free_string (
// char * string);
@@ -241,9 +236,9 @@ interface LibJna : Library {
// FfiResult_Vec_LocalUtxo_t unspent_result);
fun free_unspent_result(unspent_result: FfiResultVec_LocalUtxo_t.ByValue)
// FfiResult_int32_t sync_wallet (
// FfiResultVoid_t sync_wallet (
// OpaqueWallet_t const * opaque_wallet);
fun sync_wallet(opaque_wallet: OpaqueWallet_t): FfiResult_int32_t.ByValue
fun sync_wallet(opaque_wallet: OpaqueWallet_t): FfiResultVoid_t.ByValue
// FfiResult_char_ptr_t new_address (
// OpaqueWallet_t const * opaque_wallet);

10
bdk-kotlin/jvm/src/main/kotlin/org/bitcoindevkit/bdk/types/VoidResult.kt
View File

@@ -7,14 +7,14 @@ import org.bitcoindevkit.bdk.LibJna
import org.slf4j.Logger
import org.slf4j.LoggerFactory
class VoidResult constructor(private val ffiResultInt32T: LibJna.FfiResult_int32_t.ByValue) :
class VoidResult constructor(private val ffiResultVoidT: LibJna.FfiResultVoid_t.ByValue) :
LibBase() {
private val log: Logger = LoggerFactory.getLogger(VoidResult::class.java)
fun value(): Unit {
val err = ffiResultInt32T.err
//val ok = ffiResultInt32T.ok
val err = ffiResultVoidT.err
when {
err.isNotEmpty() -> {
log.error("JnaError: $err")
@@ -27,7 +27,7 @@ class VoidResult constructor(private val ffiResultInt32T: LibJna.FfiResult_int32
}
protected fun finalize() {
libJna.free_int_result(ffiResultInt32T)
log.debug("$ffiResultInt32T freed")
libJna.free_void_result(ffiResultVoidT)
log.debug("$ffiResultVoidT freed")
}
}