diff --git a/bdk-ffi b/bdk-ffi index 1c5f486..5168857 160000 --- a/bdk-ffi +++ b/bdk-ffi @@ -1 +1 @@ -Subproject commit 1c5f4863c6a53cc9d063d34c4e13c91fea5c58de +Subproject commit 51688577c9a45e2ff41089f587235bfffff662fc diff --git a/examples/src/main/kotlin/Kyoto.kt b/examples/src/main/kotlin/Kyoto.kt index edda3f5..44e54bc 100644 --- a/examples/src/main/kotlin/Kyoto.kt +++ b/examples/src/main/kotlin/Kyoto.kt @@ -19,10 +19,6 @@ fun main() { val peer: Peer = Peer(ip, 18444u, false) val peers: List = listOf(peer) - val persistenceDir: Path = Paths.get("examples/data").toAbsolutePath().normalize() - Files.createDirectories(persistenceDir) - val persistenceFilePath: Path = Files.createTempDirectory(persistenceDir, "kyoto-data_") - val wallet = getNewWallet(ActiveWalletScriptType.P2WPKH, Network.REGTEST) val address = wallet.revealNextAddress(KeychainKind.EXTERNAL) @@ -40,7 +36,6 @@ fun main() { .peers(peers) .connections(1u) .scanType(ScanType.Sync) - .dataDir(persistenceFilePath.toString()) .build(wallet) val client = lightClient.client val node = lightClient.node diff --git a/lib/src/test/kotlin/org/bitcoindevkit/CbfSyncTest.kt b/lib/src/test/kotlin/org/bitcoindevkit/CbfSyncTest.kt index e11ef03..dcba2c0 100644 --- a/lib/src/test/kotlin/org/bitcoindevkit/CbfSyncTest.kt +++ b/lib/src/test/kotlin/org/bitcoindevkit/CbfSyncTest.kt @@ -3,9 +3,6 @@ package org.bitcoindevkit import org.junit.jupiter.api.Nested import org.kotlinbitcointools.regtesttoolbox.regenv.RegEnv import kotlinx.coroutines.runBlocking -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.Paths import kotlin.test.Test class CbfSyncTest { @@ -28,10 +25,6 @@ class CbfSyncTest { regtestEnv.send(newAddress.toString(), 0.12345678, 2.0) regtestEnv.mine(2) - val persistenceDir: Path = Paths.get("src/test/data").toAbsolutePath().normalize() - Files.createDirectories(persistenceDir) - val persistenceFilePath: Path = Files.createTempDirectory(persistenceDir, "kyoto_data_") - val ip: IpAddress = IpAddress.fromIpv4(127u, 0u, 0u, 1u) val peer1: Peer = Peer(ip, 18444u, false) val peers: List = listOf(peer1) @@ -39,7 +32,6 @@ class CbfSyncTest { .peers(peers) .connections(1u) .scanType(ScanType.Sync) - .dataDir(persistenceFilePath.toString()) .build(wallet) node.run() diff --git a/scripts/build-linux-x86_64.sh b/scripts/build-linux-x86_64.sh index 306c643..6249fc7 100644 --- a/scripts/build-linux-x86_64.sh +++ b/scripts/build-linux-x86_64.sh @@ -23,7 +23,7 @@ rustup target add $COMPILATION_TARGET cargo build --locked --profile release-smaller --target $COMPILATION_TARGET # Generate Kotlin bindings using uniffi-bindgen -cargo run --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format +cargo run --features uniffi-bindgen --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format # Copy the binary to the resources directory mkdir -p ../../lib/src/main/$RESOURCE_DIR/ diff --git a/scripts/build-macos-aarch64.sh b/scripts/build-macos-aarch64.sh index 389b376..1c0868a 100644 --- a/scripts/build-macos-aarch64.sh +++ b/scripts/build-macos-aarch64.sh @@ -23,7 +23,7 @@ rustup target add $COMPILATION_TARGET cargo build --locked --profile release-smaller --target $COMPILATION_TARGET # Generate Kotlin bindings using uniffi-bindgen -cargo run --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format +cargo run --features uniffi-bindgen --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format # Copy the binary to the resources directory mkdir -p ../../lib/src/main/$RESOURCE_DIR/ diff --git a/scripts/build-macos-x86_64.sh b/scripts/build-macos-x86_64.sh index 40e06e9..089429b 100644 --- a/scripts/build-macos-x86_64.sh +++ b/scripts/build-macos-x86_64.sh @@ -23,7 +23,7 @@ rustup target add $COMPILATION_TARGET cargo build --locked --profile release-smaller --target $COMPILATION_TARGET # Generate Kotlin bindings using uniffi-bindgen -cargo run --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format +cargo run --features uniffi-bindgen --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format # Copy the binary to the resources directory mkdir -p ../../lib/src/main/$RESOURCE_DIR/ diff --git a/scripts/build-windows-x86_64.sh b/scripts/build-windows-x86_64.sh index b2b6072..a87f849 100644 --- a/scripts/build-windows-x86_64.sh +++ b/scripts/build-windows-x86_64.sh @@ -23,7 +23,7 @@ rustup target add $COMPILATION_TARGET cargo build --locked --profile release-smaller --target $COMPILATION_TARGET # Generate Kotlin bindings using uniffi-bindgen -cargo run --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format +cargo run --features uniffi-bindgen --bin uniffi-bindgen generate --library ./$TARGET_DIR/$LIB_NAME --language kotlin --out-dir ../../lib/src/main/kotlin/ --no-format # Copy the binary to the resources directory mkdir -p ../../lib/src/main/$RESOURCE_DIR/