From b9aa3da1209584495f3a5170994f309721414bb1 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Wed, 17 Apr 2024 11:34:25 -0400 Subject: [PATCH] fix: use alpha 9 types for tests --- bdk-android/lib/build.gradle.kts | 3 +++ .../kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt | 4 ++-- .../androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt | 4 ++-- bdk-ffi/src/error.rs | 7 ++++--- .../src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt | 4 ++-- .../src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt | 2 +- bdk-python/tests/test_live_tx_builder.py | 2 +- bdk-python/tests/test_live_wallet.py | 2 +- .../Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift | 2 +- bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/bdk-android/lib/build.gradle.kts b/bdk-android/lib/build.gradle.kts index 89386035..dd25310a 100644 --- a/bdk-android/lib/build.gradle.kts +++ b/bdk-android/lib/build.gradle.kts @@ -111,6 +111,9 @@ afterEvaluate { tasks.named("mergeReleaseJniLibFolders") { dependsOn(":lib:moveNativeAndroidLibs") } + tasks.named("mergeDebugJniLibFolders") { + dependsOn(":lib:moveNativeAndroidLibs") + } } signing { diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt index c1da5b5f..9ed1255e 100644 --- a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt +++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt @@ -33,7 +33,7 @@ class LiveTxBuilderTest { assert(wallet.getBalance().total > 0uL) val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .addRecipient(recipient.scriptPubkey(), 4200uL) .feeRate(FeeRate.fromSatPerVb(2uL)) .finish(wallet) @@ -61,7 +61,7 @@ class LiveTxBuilderTest { ScriptAmount(recipient2.scriptPubkey(), 4200uL), ) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .setRecipients(allRecipients) .feeRate(FeeRate.fromSatPerVb(4uL)) .changePolicy(ChangeSpendPolicy.CHANGE_FORBIDDEN) diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt index c666e5e2..5e38242f 100644 --- a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt +++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt @@ -61,9 +61,9 @@ class LiveWalletTest { val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .addRecipient(recipient.scriptPubkey(), 4200uL) - .feeRate(FeeRate.fromSatPerVb(4.0f)) + .feeRate(FeeRate.fromSatPerVb(4uL)) .finish(wallet) println(psbt.serialize()) diff --git a/bdk-ffi/src/error.rs b/bdk-ffi/src/error.rs index e0ac314f..d4705d2f 100644 --- a/bdk-ffi/src/error.rs +++ b/bdk-ffi/src/error.rs @@ -384,9 +384,10 @@ impl From for EsploraError { BdkEsploraError::Minreq(e) => EsploraError::Minreq { error_message: e.to_string(), }, - BdkEsploraError::HttpResponse { status, message } => { - EsploraError::HttpResponse { status: status, error_message: message } - } + BdkEsploraError::HttpResponse { status, message } => EsploraError::HttpResponse { + status, + error_message: message, + }, BdkEsploraError::Parsing(e) => EsploraError::Parsing { error_message: e.to_string(), }, diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt index 0e58cf9a..4c07de27 100644 --- a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt +++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt @@ -31,7 +31,7 @@ class LiveTxBuilderTest { assert(wallet.getBalance().total > 0uL) val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .addRecipient(recipient.scriptPubkey(), 4200uL) .feeRate(FeeRate.fromSatPerVb(2uL)) .finish(wallet) @@ -60,7 +60,7 @@ class LiveTxBuilderTest { ScriptAmount(recipient2.scriptPubkey(), 4200uL), ) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .setRecipients(allRecipients) .feeRate(FeeRate.fromSatPerVb(4uL)) .changePolicy(ChangeSpendPolicy.CHANGE_FORBIDDEN) diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt index 813abfbc..eea4f5fa 100644 --- a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt +++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt @@ -59,7 +59,7 @@ class LiveWalletTest { val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET) - val psbt: PartiallySignedTransaction = TxBuilder() + val psbt: Psbt = TxBuilder() .addRecipient(recipient.scriptPubkey(), 4200uL) .feeRate(FeeRate.fromSatPerVb(2uL)) .finish(wallet) diff --git a/bdk-python/tests/test_live_tx_builder.py b/bdk-python/tests/test_live_tx_builder.py index 381068f1..2d2e4d16 100644 --- a/bdk-python/tests/test_live_tx_builder.py +++ b/bdk-python/tests/test_live_tx_builder.py @@ -76,7 +76,7 @@ def complex_tx_builder(self): bdk.ScriptAmount(recipient2.script_pubkey, 4200) ) - psbt: bdk.PartiallySignedTransaction = bdk.TxBuilder().set_recipients(all_recipients).fee_rate(fee_rate=bdk.FeeRate.from_sat_per_vb(2)).enable_rbf().finish(wallet) + psbt: bdk.Psbt = bdk.TxBuilder().set_recipients(all_recipients).fee_rate(fee_rate=bdk.FeeRate.from_sat_per_vb(2)).enable_rbf().finish(wallet) wallet.sign(psbt) self.assertTrue(psbt.serialize().startswith("cHNi"), "The PSBT should start with cHNi") diff --git a/bdk-python/tests/test_live_wallet.py b/bdk-python/tests/test_live_wallet.py index ead2e17a..273b3950 100644 --- a/bdk-python/tests/test_live_wallet.py +++ b/bdk-python/tests/test_live_wallet.py @@ -64,7 +64,7 @@ def test_broadcast_transaction(self): network = bdk.Network.TESTNET ) - psbt = bdk.TxBuilder().add_recipient(script=recipient.script_pubkey(), amount=4200).fee_rate(fee_rate=bdk.FeeRate.from_sat_per_vb(2)).finish(wallet) + psbt: bdk.Psbt = bdk.TxBuilder().add_recipient(script=recipient.script_pubkey(), amount=4200).fee_rate(fee_rate=bdk.FeeRate.from_sat_per_vb(2)).finish(wallet) # print(psbt.serialize()) self.assertTrue(psbt.serialize().startswith("cHNi"), "The PSBT should start with cHNi") diff --git a/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift index e6ede22e..ab22ae6e 100644 --- a/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift +++ b/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift @@ -86,7 +86,7 @@ final class LiveTxBuilderTests: XCTestCase { ScriptAmount(script: recipient2.scriptPubkey(), amount: 4200) ] - let psbt: PartiallySignedTransaction = try TxBuilder() + let psbt: Psbt = try TxBuilder() .setRecipients(recipients: allRecipients) .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 4)) .changePolicy(changePolicy: ChangeSpendPolicy.changeForbidden) diff --git a/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift index 12ee9e7f..d2dc7426 100644 --- a/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift +++ b/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift @@ -78,7 +78,7 @@ final class LiveWalletTests: XCTestCase { print("Balance: \(wallet.getBalance().total)") let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet) - let psbt: PartiallySignedTransaction = try + let psbt: Psbt = try TxBuilder() .addRecipient(script: recipient.scriptPubkey(), amount: 4200) .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2))