f Update Kotlin JVM test for ChannelPending

Author: tnull

bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt

@@ -7,6 +7,11 @@ import kotlin.UInt
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.io.path.createTempDirectory
+import java.net.URI
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
+
 import org.lightningdevkit.ldknode.*;
 
 fun runCommandAndWait(cmd: String): String {
@@ -24,10 +29,10 @@ fun mine(blocks: UInt) {
     println("Mining output: $output")
 }
 
-fun sendToAddress(address: String, amountSats: UInt) {
+fun sendToAddress(address: String, amountSats: UInt): String {
     val amountBtc = amountSats.toDouble() / 100000000.0
     val output = runCommandAndWait("bitcoin-cli -regtest sendtoaddress $address $amountBtc")
-    println("Sending output: $output")
+    return output
 }
 
 fun setup() {
@@ -36,6 +41,22 @@ fun setup() {
     mine(101u)
 }
 
+fun waitForTx(esploraEndpoint: String, txid: String) {
+    var esploraPickedUpTx = false
+    val re = Regex("\"txid\":\"$txid\"");
+    while (!esploraPickedUpTx) {
+        val client = HttpClient.newBuilder().build()
+        val request = HttpRequest.newBuilder()
+            .uri(URI.create(esploraEndpoint + "/tx/" + txid))
+            .build();
+
+        val response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+        esploraPickedUpTx = re.containsMatchIn(response.body());
+        Thread.sleep(1_000)
+    }
+}
+
 class LibraryTest {
     @Test fun fullCycle() {
         setup()
@@ -51,8 +72,10 @@ class LibraryTest {
         val listenAddress1 = "127.0.0.1:2323"
         val listenAddress2 = "127.0.0.1:2324"
 
-        val config1 = Config(tmpDir1, "http://127.0.0.1:3002", network, listenAddress1, 2048u)
-        val config2 = Config(tmpDir2, "http://127.0.0.1:3002", network, listenAddress2, 2048u)
+        val esploraEndpoint = "http://127.0.0.1:3002"
+
+        val config1 = Config(tmpDir1, esploraEndpoint, network, listenAddress1, 2048u)
+        val config2 = Config(tmpDir2, esploraEndpoint, network, listenAddress2, 2048u)
 
         val builder1 = Builder.fromConfig(config1)
         val builder2 = Builder.fromConfig(config2)
@@ -75,10 +98,12 @@ class LibraryTest {
         val address2 = node2.newFundingAddress()
         println("Funding address 2: $address2")
 
-        sendToAddress(address1, 100000u)
-        sendToAddress(address2, 100000u)
+        val txid1 = sendToAddress(address1, 100000u)
+        val txid2 = sendToAddress(address2, 100000u)
         mine(6u)
-        Thread.sleep(5_000)
+
+        waitForTx(esploraEndpoint, txid1)
+        waitForTx(esploraEndpoint, txid2)
 
         node1.syncWallets()
         node2.syncWallets()
@@ -96,11 +121,24 @@ class LibraryTest {
         assertEquals(100000u, totalBalance1)
         assertEquals(100000u, totalBalance2)
 
-        val idAndAddress2 = nodeId2 + "@" + listenAddress2
-        node1.connectOpenChannel(idAndAddress2, 50000u, true)
+        node1.connectOpenChannel(nodeId2, listenAddress2, 50000u, null, true)
 
-        // Sleep a bit to allow for propagation
-        Thread.sleep(3_000)
+        val channelPendingEvent1 = node1.nextEvent()
+        println("Got event: $channelPendingEvent1")
+        assert(channelPendingEvent1 is Event.ChannelPending)
+        node1.eventHandled()
+
+        val channelPendingEvent2 = node2.nextEvent()
+        println("Got event: $channelPendingEvent2")
+        assert(channelPendingEvent2 is Event.ChannelPending)
+        node2.eventHandled()
+
+        val fundingTxid = when (channelPendingEvent1) {
+            is Event.ChannelPending -> channelPendingEvent1.fundingTxo.txid
+                else -> return
+        }
+
+        waitForTx(esploraEndpoint, fundingTxid)
 
         mine(6u)
 
@@ -146,9 +184,6 @@ class LibraryTest {
 
         node2.closeChannel(channelId, nodeId1)
 
-        // Sleep a bit to allow for propagation
-        Thread.sleep(3_000)
-
         val channelClosedEvent1 = node1.nextEvent()
         println("Got event: $channelClosedEvent1")
         assert(channelClosedEvent1 is Event.ChannelClosed)
@@ -161,7 +196,7 @@ class LibraryTest {
 
         mine(1u)
 
-        // Sleep a bit to allow for propagation
+        // Sleep a bit to allow for the block to propagate to esplora
         Thread.sleep(3_000)
 
         node1.syncWallets()