fix: if a error is throws from bitcoind return the error to cln

This is always true except for the get block by height Signed-off-by: Vincenzo Palazzo <[email protected]>
clightning4j · Nov 16, 2022 · 7ab269a · 7ab269a
1 parent 528d1b4
commit 7ab269a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/btcli4j-gen.sh b/btcli4j-gen.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # Script generated from gradle! By clightning4j
 
-/usr/lib/jvm/jdk-11.0.10/bin/java -jar /home/vincent/Github/clightning4j/btcli4j/build/libs/btcli4j-all.jar
+/home/vincent/.jdks/azul-15.0.9/bin/java -jar /home/vincent/Github/clightning4j/btcli4j/build/libs/btcli4j-all.jar
diff --git a/compile_commands.json b/compile_commands.json
@@ -0,0 +1 @@
+[]
diff --git a/src/main/kotlin/io/vincenzopalazzo/btcli4j/control/commands/btcprune/GetChainInfoBtc.kt b/src/main/kotlin/io/vincenzopalazzo/btcli4j/control/commands/btcprune/GetChainInfoBtc.kt
@@ -69,9 +69,9 @@ class GetChainInfoBtc(
             throw exception
         } catch (exception: Exception) {
             when (exception) {
-                /*is BitcoinCoreException -> {
+                is BitcoinCoreException -> {
                     plugin.log(PluginLog.ERROR, "GetChainInfoBtc: terminate bitcoin core with error: %s".format(exception.message))
-                }*/
+                }
                 is LiteBitcoinRPCException -> {
                     plugin.log(PluginLog.ERROR, exception.stackTraceToString())
                 }

diff --git a/...main/kotlin/io/vincenzopalazzo/btcli4j/control/commands/btcprune/SendRawTransactionBtc.kt b/...main/kotlin/io/vincenzopalazzo/btcli4j/control/commands/btcprune/SendRawTransactionBtc.kt
@@ -60,13 +60,16 @@ class SendRawTransactionBtc(private val bitcoinRPC: LiteBitcoinRPC, private val
             when (exception) {
                 is BitcoinCoreException -> {
                     plugin.log(PluginLog.ERROR, "GetChainInfoBtc: terminate bitcoin core with error: %s".format(exception.message))
+                    response.apply {
+                        add("errmsg", exception.message)
+                    }
                 }
                 is LiteBitcoinRPCException -> {
                     plugin.log(PluginLog.ERROR, exception.stackTraceToString())
+                    plugin.log(PluginLog.DEBUG, "SendRawTransactionBtc: Share message to esplora")
+                    alternative.run(plugin, request, response)
                 }
             }
-            plugin.log(PluginLog.DEBUG, "SendRawTransactionBtc: Share message to esplora")
-            alternative.run(plugin, request, response)
         }
     }
 }