From f205269d9724ca62c5850fc9ef9ea419d193eac0 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 28 Mar 2022 17:17:27 -0700 Subject: [PATCH] Fix tests network and addresses to TESTNET Must be TESTNET to match BlockchainConfig. --- .../kotlin/org/bitcoindevkit/AndroidLibTest.kt | 14 +++++++------- .../test/kotlin/org/bitcoindevkit/JvmLibTest.kt | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt index 6981b38..785cc7a 100644 --- a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt +++ b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt @@ -46,25 +46,25 @@ class AndroidLibTest { @Test fun memoryWalletNewAddress() { - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val address = wallet.getNewAddress() assertNotNull(address) - assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") + assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) } @Test(expected = BdkException.Descriptor::class) fun invalidDescriptorExceptionIsThrown() { - Wallet("invalid-descriptor", null, Network.REGTEST, databaseConfig, blockchainConfig) + Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig, blockchainConfig) } @Test fun sledWalletNewAddress() { val testDataDir = getTestDataDir() val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb")) - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val address = wallet.getNewAddress() assertNotNull(address) - assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") + assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) cleanupTestDataDir(testDataDir) } @@ -72,7 +72,7 @@ class AndroidLibTest { fun sqliteWalletSyncGetBalance() { val testDataDir = getTestDataDir()+"/bdk-wallet.sqlite" val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir)) - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) wallet.sync(LogProgress(), null) val balance = wallet.getBalance() assertTrue(balance > 0u) @@ -106,7 +106,7 @@ class AndroidLibTest { @Test fun onlineWalletSyncGetBalance() { - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) wallet.sync(LogProgress(), null) 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 d414e08..2f865c1 100644 --- a/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt +++ b/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt @@ -40,33 +40,33 @@ class JvmLibTest { @Test fun memoryWalletNewAddress() { - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val address = wallet.getNewAddress() assertNotNull(address) - assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") + assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) } @Test(expected = BdkException.Descriptor::class) fun invalidDescriptorExceptionIsThrown() { - Wallet("invalid-descriptor", null, Network.REGTEST, databaseConfig, blockchainConfig) + Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig, blockchainConfig) } @Test fun sledWalletNewAddress() { val testDataDir = getTestDataDir() val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb")) - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val address = wallet.getNewAddress() assertNotNull(address) - assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") + assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) cleanupTestDataDir(testDataDir) } @Test fun sqliteWalletSyncGetBalance() { - val testDataDir = getTestDataDir()+"/bdk-wallet.sqlite" + val testDataDir = getTestDataDir() + "/bdk-wallet.sqlite" val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir)) - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) wallet.sync(LogProgress(), null) val balance = wallet.getBalance() assertTrue(balance > 0u) @@ -101,7 +101,7 @@ class JvmLibTest { @Test fun onlineWalletSyncGetBalance() { - val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig) + val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) wallet.sync(LogProgress(), null) val balance = wallet.getBalance() assertTrue(balance > 0u)