@@ -12,20 +12,21 @@ import java.net.http.HttpClient
1212import java.net.http.HttpRequest
1313import java.net.http.HttpResponse
1414
15- import org.lightningdevkit.ldknode.*;
16-
17- fun runCommandAndWait (cmd : String ): String {
18- println (" Running command \" $cmd \" " )
19- val p = Runtime .getRuntime().exec(cmd)
20- p.waitFor()
21- val stdout = p.inputStream.bufferedReader().lineSequence().joinToString(" \n " )
22- val stderr = p.errorStream.bufferedReader().lineSequence().joinToString(" \n " )
15+ fun runCommandAndWait (vararg cmd : String ): String {
16+ println (" Running command \" ${cmd.joinToString(" " )} \" " )
17+
18+ val processBuilder = ProcessBuilder (cmd.toList())
19+ val process = processBuilder.start()
20+
21+ process.waitFor()
22+ val stdout = process.inputStream.bufferedReader().lineSequence().joinToString(" \n " )
23+ val stderr = process.errorStream.bufferedReader().lineSequence().joinToString(" \n " )
2324 return stdout + stderr
2425}
2526
2627fun mine (blocks : UInt ): String {
27- val address = runCommandAndWait(" bitcoin-cli -regtest getnewaddress" )
28- val output = runCommandAndWait(" bitcoin-cli -regtest generatetoaddress $ blocks $ address" )
28+ val address = runCommandAndWait(" bitcoin-cli" , " -regtest" , " getnewaddress" )
29+ val output = runCommandAndWait(" bitcoin-cli" , " -regtest" , " generatetoaddress" , blocks.toString(), address)
2930 println (" Mining output: $output " )
3031 val re = Regex (" \n .+\n\\ ]$" )
3132 val lastBlock = re.find(output)!! .value.replace(" ]" ," " ).replace(" \" " , " " ).replace(" \n " ," " ).trim()
@@ -40,13 +41,13 @@ fun mineAndWait(esploraEndpoint: String, blocks: UInt) {
4041
4142fun sendToAddress (address : String , amountSats : UInt ): String {
4243 val amountBtc = amountSats.toDouble() / 100000000.0
43- val output = runCommandAndWait(" bitcoin-cli -regtest sendtoaddress $ address $ amountBtc" )
44+ val output = runCommandAndWait(" bitcoin-cli" , " -regtest" , " sendtoaddress" , address, amountBtc.toString() )
4445 return output
4546}
4647
4748fun setup () {
48- runCommandAndWait(" bitcoin-cli -regtest createwallet ldk_node_test" )
49- runCommandAndWait(" bitcoin-cli -regtest loadwallet ldk_node_test true" )
49+ runCommandAndWait(" bitcoin-cli" , " -regtest" , " createwallet" , " ldk_node_test" )
50+ runCommandAndWait(" bitcoin-cli" , " -regtest" , " loadwallet" , " ldk_node_test" , " true" )
5051 mine(101u )
5152 Thread .sleep(5_000 )
5253}
@@ -77,7 +78,6 @@ fun waitForBlock(esploraEndpoint: String, blockHash: String) {
7778 .build();
7879
7980 val response = client.send(request, HttpResponse .BodyHandlers .ofString());
80- val body = response.body()
8181
8282 esploraPickedUpBlock = re.containsMatchIn(response.body());
8383 Thread .sleep(500 )
@@ -97,8 +97,6 @@ class LibraryTest {
9797 val listenAddress1 = " 127.0.0.1:2323"
9898 val listenAddress2 = " 127.0.0.1:2324"
9999
100- val logLevel = LogLevel .TRACE ;
101-
102100 val config1 = Config ()
103101 config1.storageDirPath = tmpDir1
104102 config1.listeningAddress = listenAddress1
0 commit comments