Merge pull request #185 from tnull/2023-11-fix-uniffi-and-kotlin-tests

Fix `uniffi-bindgen` and Kotlin full cycle test
lightningdevkit · Nov 3, 2023 · d78cab0 · d78cab0
2 parents 47b1411 + 296c3b8
commit d78cab0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,10 +17,6 @@ categories = ["cryptography::cryptocurrencies"]
 crate-type = ["lib", "staticlib", "cdylib"]
 name = "ldk_node"
 
-[[bin]]
-name = "uniffi-bindgen"
-path = "uniffi-bindgen.rs"
-
 [profile.release-smaller]
 inherits = "release"
 opt-level = 'z'     # Optimize for size.
@@ -83,7 +79,7 @@ proptest = "1.0.0"
 regex = "1.5.6"
 
 [build-dependencies]
-uniffi = { version = "0.23.0", features = ["build", "cli"], optional = true }
+uniffi = { version = "0.23.0", features = ["build"], optional = true }
 
 [profile.release]
 panic = "abort"

diff --git a/bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt b/bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt
@@ -205,7 +205,7 @@ class LibraryTest {
                 else -> return
         }
 
-        val invoice = node2.receivePayment(1000000u, "asdf", 9217u)
+        val invoice = node2.receivePayment(2500000u, "asdf", 9217u)
 
         node1.sendPayment(invoice)
 
@@ -245,7 +245,7 @@ class LibraryTest {
         println("Spendable balance 2 after close: $spendableBalance2AfterClose")
         assert(spendableBalance1AfterClose > 95000u)
         assert(spendableBalance1AfterClose < 100000u)
-        assertEquals(101000uL, spendableBalance2AfterClose)
+        assertEquals(102500uL, spendableBalance2AfterClose)
 
         node1.stop()
         node2.stop()

diff --git a/bindings/uniffi-bindgen/Cargo.toml b/bindings/uniffi-bindgen/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "uniffi-bindgen"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+uniffi = { version = "0.23.0", features = ["cli"] }
diff --git a/uniffi-bindgen.rs → bindings/uniffi-bindgen/src/main.rs b/uniffi-bindgen.rs → bindings/uniffi-bindgen/src/main.rs
@@ -1,4 +1,3 @@
 fn main() {
-	#[cfg(feature = "uniffi/cli")]
 	uniffi::uniffi_bindgen_main()
 }
diff --git a/scripts/uniffi_bindgen_generate_kotlin.sh b/scripts/uniffi_bindgen_generate_kotlin.sh
@@ -3,7 +3,7 @@ BINDINGS_DIR="bindings/kotlin"
 TARGET_DIR="target/bindings/kotlin"
 PROJECT_DIR="ldk-node-jvm"
 PACKAGE_DIR="org/lightningdevkit/ldknode"
-UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
+UNIFFI_BINDGEN_BIN="cargo run --manifest-path bindings/uniffi-bindgen/Cargo.toml"
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
 	rustup target add x86_64-unknown-linux-gnu || exit 1

diff --git a/scripts/uniffi_bindgen_generate_kotlin_android.sh b/scripts/uniffi_bindgen_generate_kotlin_android.sh
@@ -3,7 +3,7 @@ BINDINGS_DIR="bindings/kotlin"
 TARGET_DIR="target"
 PROJECT_DIR="ldk-node-android"
 PACKAGE_DIR="org/lightningdevkit/ldknode"
-UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
+UNIFFI_BINDGEN_BIN="cargo run --manifest-path bindings/uniffi-bindgen/Cargo.toml"
 ANDROID_NDK_ROOT="/opt/homebrew/share/android-ndk"
 LLVM_ARCH_PATH="darwin-x86_64"
 PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$LLVM_ARCH_PATH/bin:$PATH"

diff --git a/scripts/uniffi_bindgen_generate_python.sh b/scripts/uniffi_bindgen_generate_python.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 BINDINGS_DIR="./bindings/python"
-UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
+UNIFFI_BINDGEN_BIN="cargo run --manifest-path bindings/uniffi-bindgen/Cargo.toml"
 
 cargo build --release --features uniffi || exit 1
 $UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language python -o "$BINDINGS_DIR" || exit 1

diff --git a/scripts/uniffi_bindgen_generate_swift.sh b/scripts/uniffi_bindgen_generate_swift.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 BINDINGS_DIR="./bindings/swift"
-UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
+UNIFFI_BINDGEN_BIN="cargo run --manifest-path bindings/uniffi-bindgen/Cargo.toml"
 
 cargo build --release || exit 1
 $UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language swift -o "$BINDINGS_DIR" || exit 1