From de9fde0d9c7708240d71d5f1ed51c117ceb15549 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 14 Jun 2022 16:31:10 -0300 Subject: [PATCH] Migrate tests to API version 0.7.0 --- .../org/bitcoindevkit/AndroidLibTest.kt | 8 +-- .../kotlin/org/bitcoindevkit/JvmLibTest.kt | 55 +++++++++---------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt index 8fc157c..ced2f5e 100644 --- a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt +++ b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt @@ -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) } @@ -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) @@ -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) @@ -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) diff --git a/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt index ba03af4..6a02dec 100644 --- a/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt +++ b/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt @@ -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) } @@ -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) @@ -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) @@ -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") + // } + // } }