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

Change order of Network param

Browse Source
This commit is contained in:
Steve Myers 2021-10-14 11:17:52 -07:00
parent fffb2e2cbc
commit 038c9ef23c
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bindings/bdk-kotlin/src/main/kotlin/uniffi/bdk/bdk.kt
View File

@ -44,15 +44,15 @@ open class RustBuffer : Structure() {
companion object { companion object {
internal fun alloc(size: Int = 0) = rustCall() { status -> internal fun alloc(size: Int = 0) = rustCall() { status ->
_UniFFILib.INSTANCE.ffi_bdk_f470_rustbuffer_alloc(size, status) _UniFFILib.INSTANCE.ffi_bdk_146a_rustbuffer_alloc(size, status)
} }
internal fun free(buf: RustBuffer.ByValue) = rustCall() { status -> internal fun free(buf: RustBuffer.ByValue) = rustCall() { status ->
_UniFFILib.INSTANCE.ffi_bdk_f470_rustbuffer_free(buf, status) _UniFFILib.INSTANCE.ffi_bdk_146a_rustbuffer_free(buf, status)
} }
internal fun reserve(buf: RustBuffer.ByValue, additional: Int) = rustCall() { status -> internal fun reserve(buf: RustBuffer.ByValue, additional: Int) = rustCall() { status ->
_UniFFILib.INSTANCE.ffi_bdk_f470_rustbuffer_reserve(buf, additional, status) _UniFFILib.INSTANCE.ffi_bdk_146a_rustbuffer_reserve(buf, additional, status)
} }
} }
@ -301,31 +301,31 @@ internal interface _UniFFILib : Library {
} }
} }
fun ffi_bdk_f470_OfflineWallet_object_free(ptr: Pointer, fun ffi_bdk_146a_OfflineWallet_object_free(ptr: Pointer,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): Unit ): Unit
fun bdk_f470_OfflineWallet_new(network: RustBuffer.ByValue,descriptor: RustBuffer.ByValue,database_config: RustBuffer.ByValue, fun bdk_146a_OfflineWallet_new(descriptor: RustBuffer.ByValue,network: RustBuffer.ByValue,database_config: RustBuffer.ByValue,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): Pointer ): Pointer
fun bdk_f470_OfflineWallet_get_new_address(ptr: Pointer, fun bdk_146a_OfflineWallet_get_new_address(ptr: Pointer,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): RustBuffer.ByValue ): RustBuffer.ByValue
fun ffi_bdk_f470_rustbuffer_alloc(size: Int, fun ffi_bdk_146a_rustbuffer_alloc(size: Int,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): RustBuffer.ByValue ): RustBuffer.ByValue
fun ffi_bdk_f470_rustbuffer_from_bytes(bytes: ForeignBytes.ByValue, fun ffi_bdk_146a_rustbuffer_from_bytes(bytes: ForeignBytes.ByValue,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): RustBuffer.ByValue ): RustBuffer.ByValue
fun ffi_bdk_f470_rustbuffer_free(buf: RustBuffer.ByValue, fun ffi_bdk_146a_rustbuffer_free(buf: RustBuffer.ByValue,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): Unit ): Unit
fun ffi_bdk_f470_rustbuffer_reserve(buf: RustBuffer.ByValue,additional: Int, fun ffi_bdk_146a_rustbuffer_reserve(buf: RustBuffer.ByValue,additional: Int,
uniffi_out_err: RustCallStatus uniffi_out_err: RustCallStatus
): RustBuffer.ByValue ): RustBuffer.ByValue
@ -804,10 +804,10 @@ public interface OfflineWalletInterface {
class OfflineWallet( class OfflineWallet(
pointer: Pointer pointer: Pointer
) : FFIObject(pointer), OfflineWalletInterface { ) : FFIObject(pointer), OfflineWalletInterface {
constructor(network: Network, descriptor: String, databaseConfig: DatabaseConfig ) : constructor(descriptor: String, network: Network, databaseConfig: DatabaseConfig ) :
this( this(
rustCallWithError(BdkException) { status -> rustCallWithError(BdkException) { status ->
_UniFFILib.INSTANCE.bdk_f470_OfflineWallet_new(network.lower(), descriptor.lower(), databaseConfig.lower() ,status) _UniFFILib.INSTANCE.bdk_146a_OfflineWallet_new(descriptor.lower(), network.lower(), databaseConfig.lower() ,status)
}) })
/** /**
@ -820,7 +820,7 @@ class OfflineWallet(
*/ */
override protected fun freeRustArcPtr() { override protected fun freeRustArcPtr() {
rustCall() { status -> rustCall() { status ->
_UniFFILib.INSTANCE.ffi_bdk_f470_OfflineWallet_object_free(this.pointer, status) _UniFFILib.INSTANCE.ffi_bdk_146a_OfflineWallet_object_free(this.pointer, status)
} }
} }
@ -835,7 +835,7 @@ class OfflineWallet(
override fun getNewAddress(): String = override fun getNewAddress(): String =
callWithPointer { callWithPointer {
rustCall() { status -> rustCall() { status ->
_UniFFILib.INSTANCE.bdk_f470_OfflineWallet_get_new_address(it, status) _UniFFILib.INSTANCE.bdk_146a_OfflineWallet_get_new_address(it, status)
} }
}.let { }.let {
String.lift(it) String.lift(it)

6
bindings/bdk-kotlin/src/test/kotlin/uniffi/bdk/LibTest.kt
View File

@ -15,7 +15,7 @@ class LibTest {
@Test @Test
fun memoryWalletNewAddress() { fun memoryWalletNewAddress() {
val config = DatabaseConfig.Memory("") val config = DatabaseConfig.Memory("")
val wallet = OfflineWallet(Network.REGTEST, desc, config) val wallet = OfflineWallet(desc, Network.REGTEST, config)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs")
@ -24,13 +24,13 @@ class LibTest {
@Test(expected=BdkException.Descriptor::class) @Test(expected=BdkException.Descriptor::class)
fun invalidDescriptorExceptionIsThrown() { fun invalidDescriptorExceptionIsThrown() {
val config = DatabaseConfig.Memory("") val config = DatabaseConfig.Memory("")
OfflineWallet(Network.REGTEST, "invalid-descriptor", config) OfflineWallet("invalid-descriptor", Network.REGTEST, config)
} }
@Test @Test
fun sledWalletNewAddress() { fun sledWalletNewAddress() {
val config = DatabaseConfig.Sled(SledDbConfiguration("/tmp/testdb", "testdb")) val config = DatabaseConfig.Sled(SledDbConfiguration("/tmp/testdb", "testdb"))
val wallet = OfflineWallet(Network.REGTEST, desc, config) val wallet = OfflineWallet(desc, Network.REGTEST, config)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs")

2
src/bdk.udl
View File

@ -64,6 +64,6 @@ interface DatabaseConfig {
interface OfflineWallet { interface OfflineWallet {
[Throws=BdkError] [Throws=BdkError]
constructor(Network network, string descriptor, DatabaseConfig database_config); constructor(string descriptor, Network network, DatabaseConfig database_config);
string get_new_address(); string get_new_address();
}; };

2
src/lib.rs
View File

@ -22,8 +22,8 @@ struct OfflineWallet {
impl OfflineWallet { impl OfflineWallet {
fn new( fn new(
network: Network,
descriptor: String, descriptor: String,
network: Network,
database_config: DatabaseConfig, database_config: DatabaseConfig,
) -> Result<Self, BdkError> { ) -> Result<Self, BdkError> {
let any_database_config = match database_config { let any_database_config = match database_config {