Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Bump bdk-ffi submodule to 0.7.0 and update tests #62

Merged
merged 3 commits into from
Jun 15, 2022
Merged

Bump bdk-ffi submodule to 0.7.0 and update tests #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe045c1
Bump bdk-ffi version to 0.7.0
thunderbiscuit Jun 14, 2022
de9fde0
Migrate tests to API version 0.7.0
thunderbiscuit Jun 14, 2022
5f2297e
Hardcode ANDROID_NDK_ROOT to fix CI issues
thunderbiscuit Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Tests

on: [push, pull_request]

env:
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529

jobs:
build:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ android {
defaultConfig {
minSdk = 21
targetSdk = 31
// versionCode = 1
// versionName = "v0.2.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
Expand Down
8 changes: 4 additions & 4 deletions android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class AndroidLibTest {
@Test
fun memoryWalletNewAddress() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress()
val address = wallet.getAddress(AddressIndex.NEW).address
assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
}
Expand All @@ -62,7 +62,7 @@ class AndroidLibTest {
val testDataDir = getTestDataDir()
val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb"))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress()
val address = wallet.getAddress(AddressIndex.NEW).address
assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
cleanupTestDataDir(testDataDir)
Expand All @@ -73,7 +73,7 @@ class AndroidLibTest {
val testDataDir = getTestDataDir()+"/bdk-wallet.sqlite"
val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val blockchain = Blockchain(blockchainConfig);
val blockchain = Blockchain(blockchainConfig)
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance()
assertTrue(balance > 0u)
Expand Down Expand Up @@ -108,7 +108,7 @@ class AndroidLibTest {
@Test
fun onlineWalletSyncGetBalance() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val blockchain = Blockchain(blockchainConfig);
val blockchain = Blockchain(blockchainConfig)
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance()
assertTrue(balance > 0u)
Expand Down
2 changes: 1 addition & 1 deletion bdk-ffi
Open in desktop
Submodule bdk-ffi updated 5 files
+1 −0 .gitignore
+18 −1 CHANGELOG.md
+2 −2 Cargo.toml
+54 −23 src/bdk.udl
+115 −58 src/lib.rs
55 changes: 27 additions & 28 deletions jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class JvmLibTest {
@Test
fun memoryWalletNewAddress() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress()
val address = wallet.getAddress(AddressIndex.NEW).address
assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
}
Expand All @@ -56,7 +56,7 @@ class JvmLibTest {
val testDataDir = getTestDataDir()
val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb"))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress()
val address = wallet.getAddress(AddressIndex.NEW).address
assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
cleanupTestDataDir(testDataDir)
Expand Down Expand Up @@ -103,7 +103,7 @@ class JvmLibTest {
@Test
fun onlineWalletSyncGetBalance() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val blockchain = Blockchain(blockchainConfig);
val blockchain = Blockchain(blockchainConfig)
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance()
assertTrue(balance > 0u)
Expand Down Expand Up @@ -153,29 +153,28 @@ class JvmLibTest {
txBuilder.finish(wallet)
}

// Comment this test in for local testing, you will need let it fail ones to get an address
// to pre-fund the test wallet before the test will pass.
// @Test
// fun walletTxBuilderDrainWallet() {
// val descriptor =
// "wpkh([8da6afbe/84'/1'/0'/0]tprv8hY7jbMbe17EH1cLw2feTyNDYvjcFYauLmbneBqVnDERBrV51LrxWjCYRZwWS5keYn3ijb7iHJuEzXQk7EzgPeKRBVNBgC4oFPDxGND5S3V/*)"
// val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig)
// wallet.sync(LogProgress(), null)
// val balance = wallet.getBalance()
// if (balance > 2000u) {
// println("balance $balance")
// // send all coins back to https://bitcoinfaucet.uo1.net
// val faucetAddress = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt"
// val txBuilder = TxBuilder().drainWallet().drainTo(faucetAddress).feeRate(1.1f)
// val psbt = txBuilder.build(wallet)
// wallet.sign(psbt)
// val txid = wallet.broadcast(psbt)
// println("https://mempool.space/testnet/tx/$txid")
// assertNotNull(txid)
// } else {
// val depositAddress = wallet.getLastUnusedAddress()
// fail("Send more testnet coins to: $depositAddress")
// }
// }

// Comment this test in for local testing, you will need let it fail ones to get an address
// to pre-fund the test wallet before the test will pass.
// @Test
// fun walletTxBuilderDrainWallet() {
// val descriptor = "wpkh([8da6afbe/84'/1'/0'/0]tprv8hY7jbMbe17EH1cLw2feTyNDYvjcFYauLmbneBqVnDERBrV51LrxWjCYRZwWS5keYn3ijb7iHJuEzXQk7EzgPeKRBVNBgC4oFPDxGND5S3V/*)"
// val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
// val blockchain = Blockchain(blockchainConfig)
// wallet.sync(blockchain, LogProgress())
// val balance = wallet.getBalance()
// if (balance > 2000u) {
// println("balance $balance")
// // send all coins back to https://bitcoinfaucet.uo1.net
// val faucetAddress = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt"
// val txBuilder = TxBuilder().drainWallet().drainTo(faucetAddress).feeRate(1.1f)
// val psbt = txBuilder.finish(wallet)
// wallet.sign(psbt)
// val txid = blockchain.broadcast(psbt)
// println("https://mempool.space/testnet/tx/$txid")
// assertNotNull(txid)
// } else {
// val depositAddress = wallet.getAddress(AddressIndex.LAST_UNUSED).address
// fail("Send more testnet coins to: $depositAddress")
// }
// }
}