chore: small fixes to tests and build scripts

Author: thunderbiscuit

.gitignore

@@ -1,5 +1,8 @@
+# Rust related
 target
 build
+
+# Kotlin related
 .gradle
 wallet_db
 bdk_ffi_test
@@ -9,13 +12,12 @@ local.properties
 *.so
 .DS_Store
 testdb
-xcuserdata
 .lsp
 .clj-kondo
 .idea/
 .editorconfig
 bdk.kt
-bitcoin.kt
+.kotlin/
 
 # Swift related
 /.build
@@ -35,12 +37,10 @@ bdk.swift
 .build
 *.xcframework/
 Info.plist
-BitcoinFFI.h
-Bitcoin.swift
-BitcoinFFi.modulemap
 bdkffi.xcframework
 Sources/
+xcuserdata
 
 # Python related
 __pycache__
-bitcoin.py
+.localenvironment/

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt

@@ -7,7 +7,6 @@ import org.junit.runner.RunWith
 import kotlin.test.AfterTest
 import kotlin.test.assertTrue
 import java.io.File
-import org.rustbitcoin.bitcoin.FeeRate
 
 private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
 private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"

bdk-python/tests/test_live_tx_builder.py

@@ -9,6 +9,8 @@
 from bdkpython import TxBuilder
 from bdkpython import Connection
 from bdkpython import Network
+from bdkpython import Amount
+from bdkpython import FeeRate
 
 import unittest
 import os
@@ -110,4 +112,4 @@ def complex_tx_builder(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

bdk-python/tests/test_live_wallet.py

@@ -8,6 +8,8 @@
 from bdkpython import TxBuilder
 from bdkpython import Connection
 from bdkpython import Network
+from bdkpython import Amount
+from bdkpython import FeeRate
 
 import unittest
 import os

bdk-swift/build-xcframework.sh

@@ -5,8 +5,6 @@
 
 HEADERPATH="Sources/BitcoinDevKit/BitcoinDevKitFFI.h"
 MODMAPPATH="Sources/BitcoinDevKit/BitcoinDevKitFFI.modulemap"
-HEADERPATH_BITCOIN_FFI="Sources/BitcoinDevKit/BitcoinFFI.h"
-MODMAPPATH_BITCOIN_FFI="Sources/BitcoinDevKit/BitcoinFFI.modulemap"
 TARGETDIR="../bdk-ffi/target"
 OUTDIR="."
 RELDIR="release-smaller"
@@ -46,11 +44,8 @@ cd ../bdk-swift/ || exit
 # move bdk-ffi static lib header files to temporary directory
 mkdir -p "${NEW_HEADER_DIR}"
 mv "${HEADERPATH}" "${NEW_HEADER_DIR}"
-mv "${HEADERPATH_BITCOIN_FFI}" "${NEW_HEADER_DIR}"
 mv "${MODMAPPATH}" "${NEW_HEADER_DIR}/module.modulemap"
 echo -e "\n" >> "${NEW_HEADER_DIR}/module.modulemap"
-cat "${MODMAPPATH_BITCOIN_FFI}" >> "${NEW_HEADER_DIR}/module.modulemap"
-rm "${MODMAPPATH_BITCOIN_FFI}"
 
 # remove old xcframework directory
 rm -rf "${OUTDIR}/${NAME}.xcframework"