From 038c9ef23cdc2b0b45464c46f9d0bdaa5e07ba0a Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 14 Oct 2021 11:17:52 -0700 Subject: [PATCH] Change order of Network param --- .../src/main/kotlin/uniffi/bdk/bdk.kt | 28 +++++++++---------- .../src/test/kotlin/uniffi/bdk/LibTest.kt | 6 ++-- src/bdk.udl | 2 +- src/lib.rs | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bindings/bdk-kotlin/src/main/kotlin/uniffi/bdk/bdk.kt b/bindings/bdk-kotlin/src/main/kotlin/uniffi/bdk/bdk.kt index 14333b7..6343671 100644 --- a/bindings/bdk-kotlin/src/main/kotlin/uniffi/bdk/bdk.kt +++ b/bindings/bdk-kotlin/src/main/kotlin/uniffi/bdk/bdk.kt @@ -44,15 +44,15 @@ open class RustBuffer : Structure() { companion object { 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 -> - _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 -> - _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 ): 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 ): Pointer - fun bdk_f470_OfflineWallet_get_new_address(ptr: Pointer, + fun bdk_146a_OfflineWallet_get_new_address(ptr: Pointer, uniffi_out_err: RustCallStatus ): RustBuffer.ByValue - fun ffi_bdk_f470_rustbuffer_alloc(size: Int, + fun ffi_bdk_146a_rustbuffer_alloc(size: Int, uniffi_out_err: RustCallStatus ): 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 ): RustBuffer.ByValue - fun ffi_bdk_f470_rustbuffer_free(buf: RustBuffer.ByValue, + fun ffi_bdk_146a_rustbuffer_free(buf: RustBuffer.ByValue, uniffi_out_err: RustCallStatus ): 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 ): RustBuffer.ByValue @@ -804,10 +804,10 @@ public interface OfflineWalletInterface { class OfflineWallet( pointer: Pointer ) : FFIObject(pointer), OfflineWalletInterface { - constructor(network: Network, descriptor: String, databaseConfig: DatabaseConfig ) : + constructor(descriptor: String, network: Network, databaseConfig: DatabaseConfig ) : this( 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() { 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 = callWithPointer { rustCall() { status -> - _UniFFILib.INSTANCE.bdk_f470_OfflineWallet_get_new_address(it, status) + _UniFFILib.INSTANCE.bdk_146a_OfflineWallet_get_new_address(it, status) } }.let { String.lift(it) diff --git a/bindings/bdk-kotlin/src/test/kotlin/uniffi/bdk/LibTest.kt b/bindings/bdk-kotlin/src/test/kotlin/uniffi/bdk/LibTest.kt index 20f9b36..da33bfb 100644 --- a/bindings/bdk-kotlin/src/test/kotlin/uniffi/bdk/LibTest.kt +++ b/bindings/bdk-kotlin/src/test/kotlin/uniffi/bdk/LibTest.kt @@ -15,7 +15,7 @@ class LibTest { @Test fun memoryWalletNewAddress() { val config = DatabaseConfig.Memory("") - val wallet = OfflineWallet(Network.REGTEST, desc, config) + val wallet = OfflineWallet(desc, Network.REGTEST, config) val address = wallet.getNewAddress() assertNotNull(address) assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") @@ -24,13 +24,13 @@ class LibTest { @Test(expected=BdkException.Descriptor::class) fun invalidDescriptorExceptionIsThrown() { val config = DatabaseConfig.Memory("") - OfflineWallet(Network.REGTEST, "invalid-descriptor", config) + OfflineWallet("invalid-descriptor", Network.REGTEST, config) } @Test fun sledWalletNewAddress() { 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() assertNotNull(address) assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") diff --git a/src/bdk.udl b/src/bdk.udl index f87a7fe..2ae60cc 100644 --- a/src/bdk.udl +++ b/src/bdk.udl @@ -64,6 +64,6 @@ interface DatabaseConfig { interface OfflineWallet { [Throws=BdkError] - constructor(Network network, string descriptor, DatabaseConfig database_config); + constructor(string descriptor, Network network, DatabaseConfig database_config); string get_new_address(); }; diff --git a/src/lib.rs b/src/lib.rs index 3d8b8b3..cf0f756 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,8 +22,8 @@ struct OfflineWallet { impl OfflineWallet { fn new( - network: Network, descriptor: String, + network: Network, database_config: DatabaseConfig, ) -> Result { let any_database_config = match database_config {