lnnode: handle conf args instead of backends

Author: pinheadmz

src/backends/compose/compose_backend.py

@@ -421,28 +421,11 @@ def add_lnd_service(self, tank, compose):
         ln_cb_container_name = self.get_container_name(tank.index, ServiceType.CIRCUITBREAKER)
         bitcoin_container_name = self.get_container_name(tank.index, ServiceType.BITCOIN)
         # These args are appended to the Dockerfile `ENTRYPOINT ["lnd"]`
-        args = [
-            "--noseedbackup",
-            "--norest",
-            "--debuglevel=debug",
-            "--accept-keysend",
-            "--bitcoin.active",
-            "--bitcoin.regtest",
-            "--bitcoin.node=bitcoind",
-            f"--bitcoind.rpcuser={tank.rpc_user}",
-            f"--bitcoind.rpcpass={tank.rpc_password}",
-            f"--bitcoind.rpchost={tank.ipv4}:{tank.rpc_port}",
-            f"--bitcoind.zmqpubrawblock=tcp://{tank.ipv4}:{tank.zmqblockport}",
-            f"--bitcoind.zmqpubrawtx=tcp://{tank.ipv4}:{tank.zmqtxport}",
-            f"--externalip={tank.lnnode.ipv4}",
-            f"--rpclisten=0.0.0.0:{tank.lnnode.rpc_port}",
-            f"--alias={tank.index}",
-            f"--tlsextradomain={ln_container_name}",
-        ]
+        args = tank.lnnode.get_conf(ln_container_name, bitcoin_container_name)
         services[ln_container_name] = {
             "container_name": ln_container_name,
             "image": tank.lnnode.image,
-            "command": " ".join(args),
+            "command": args,
             "networks": {
                 tank.network_name: {
                     "ipv4_address": f"{tank.lnnode.ipv4}",

src/backends/kubernetes/kubernetes_backend.py

@@ -442,23 +442,7 @@ def create_lnd_container(
         # These args are appended to the Dockerfile `ENTRYPOINT ["lnd"]`
         bitcoind_rpc_host = f"{bitcoind_service_name}.{self.namespace}"
         lightning_dns = f"lightning-{tank.index}.{self.namespace}"
-        args = [
-            "--noseedbackup",
-            "--norest",
-            "--debuglevel=debug",
-            "--accept-keysend",
-            "--bitcoin.active",
-            "--bitcoin.regtest",
-            "--bitcoin.node=bitcoind",
-            f"--bitcoind.rpcuser={tank.rpc_user}",
-            f"--bitcoind.rpcpass={tank.rpc_password}",
-            f"--bitcoind.rpchost={bitcoind_rpc_host}:{tank.rpc_port}",
-            f"--bitcoind.zmqpubrawblock={bitcoind_rpc_host}:{tank.zmqblockport}",
-            f"--bitcoind.zmqpubrawtx={bitcoind_rpc_host}:{tank.zmqtxport}",
-            f"--rpclisten=0.0.0.0:{tank.lnnode.rpc_port}",
-            f"--externalhosts={lightning_dns}",
-            f"--alias={tank.index}",
-        ]
+        args = tank.lnnode.get_conf(lightning_dns, bitcoind_rpc_host)
         self.log.debug(f"Creating lightning container for tank {tank.index} using {args=:}")
         lightning_container = client.V1Container(
             name=LN_CONTAINER_NAME,

src/warnet/lnnode.py

@@ -5,6 +5,15 @@
 
 from .status import RunningStatus
 
+LND_CONFIG_BASE = " ".join([
+    "--noseedbackup",
+    "--norest",
+    "--debuglevel=debug",
+    "--accept-keysend",
+    "--bitcoin.active",
+    "--bitcoin.regtest",
+    "--bitcoin.node=bitcoind"
+])
 
 class LNNode:
     def __init__(self, warnet, tank, impl, image, backend: BackendInterface, cb=None):
@@ -32,6 +41,21 @@ def cb_status(self) -> RunningStatus:
             self.tank.index, ServiceType.CIRCUITBREAKER
         )
 
+    def get_conf(self, ln_container_name, tank_container_name) -> str:
+        if self.impl == "lnd":
+            conf = LND_CONFIG_BASE
+            conf += f" --bitcoind.rpcuser={self.tank.rpc_user}"
+            conf += f" --bitcoind.rpcpass={self.tank.rpc_password}"
+            conf += f" --bitcoind.rpchost={tank_container_name}:{self.tank.rpc_port}"
+            conf += f" --bitcoind.zmqpubrawblock=tcp://{tank_container_name}:{self.tank.zmqblockport}"
+            conf += f" --bitcoind.zmqpubrawtx=tcp://{tank_container_name}:{self.tank.zmqtxport}"
+            conf += f" --rpclisten=0.0.0.0:{self.rpc_port}"
+            conf += f" --alias={self.tank.index}"
+            conf += f" --externalhosts={ln_container_name}"
+            conf += f" --tlsextradomain={ln_container_name}"
+            return conf
+        return ""
+
     @exponential_backoff(max_retries=20, max_delay=300)
     @handle_json
     def lncli(self, cmd) -> dict: