Skip to content

Commit 4a109cf

Browse files
committed
add support for testing LNNode through rpc
add new ln_mixed_test add support for switching zmqblock format on bitcoin core node
1 parent 8291e7e commit 4a109cf

File tree

9 files changed

+448
-88
lines changed

9 files changed

+448
-88
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
- graph_test.py
4242
- logging_test.py
4343
- ln_basic_test.py
44+
- ln_mixed_test.py
4445
- ln_test.py
4546
- onion_test.py
4647
- plugin_test.py

resources/charts/bitcoincore/charts/eclair/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ baseConfig: |
102102
eclair.api.password = 21satoshi
103103
eclair.api.port = 8080
104104
eclair.features.keysend = optional
105-
eclair.bitcoind.startup-locked-utxos-behavior = "unlock"
106105
107106
config: ""
108107

resources/charts/bitcoincore/templates/_helpers.tpl

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Create the name of the service account to use
5656
{{- end }}
5757
{{- end }}
5858

59-
6059
{{/*
6160
Add network section heading in bitcoin.conf
6261
Always add for custom semver, check version for valid semver
@@ -68,3 +67,14 @@ Always add for custom semver, check version for valid semver
6867
[{{ .Values.global.chain }}]
6968
{{- end -}}
7069
{{- end -}}
70+
71+
{{/*
72+
eclair requires zmqpubhashblock https://github.com/ACINQ/eclair/blob/master/README.md#installation
73+
*/}}
74+
{{- define "bitcoincore.set_zmqblocktype" -}}
75+
{{- if .Values.eclair.enabled -}}
76+
zmqpubhashblock
77+
{{- else }}
78+
zmqpubrawblock
79+
{{- end -}}
80+
{{- end -}}

resources/charts/bitcoincore/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ data:
1212
{{- .Values.baseConfig | nindent 4 }}
1313
rpcport={{ index .Values.global .Values.global.chain "RPCPort" }}
1414
rpcpassword={{ .Values.global.rpcpassword }}
15-
zmqpubrawblock=tcp://0.0.0.0:{{ .Values.global.ZMQBlockPort }}
15+
{{- include "bitcoincore.set_zmqblocktype" . | nindent 4 }}=tcp://0.0.0.0:{{ .Values.global.ZMQBlockPort }}
1616
zmqpubrawtx=tcp://0.0.0.0:{{ .Values.global.ZMQTxPort }}
1717
{{- .Values.defaultConfig | nindent 4 }}
1818
{{- .Values.config | nindent 4 }}

0 commit comments

Comments
 (0)