From c24ac5d3633fbd55ab3c8fa4540a11313be85d85 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 16 Oct 2020 17:43:00 +0200
Subject: [PATCH] clightning: remove redundant option 'bitcoin-rpcconnect'

---
 modules/clightning.nix      | 8 ++------
 modules/netns-isolation.nix | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/clightning.nix b/modules/clightning.nix
index 3cb4131..cb4cb5e 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -12,7 +12,8 @@ let
     ${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"}
     always-use-proxy=${if cfg.always-use-proxy then "true" else "false"}
     bind-addr=${cfg.bind-addr}:${toString cfg.bindport}
-    ${optionalString (cfg.bitcoin-rpcconnect != null) "bitcoin-rpcconnect=${cfg.bitcoin-rpcconnect}"}
+    bitcoin-rpcconnect=${builtins.elemAt config.services.bitcoind.rpcbind 0}
+    bitcoin-rpcport=${toString config.services.bitcoind.rpc.port}
     bitcoin-rpcuser=${config.services.bitcoind.rpc.users.public.name}
     rpc-file-mode=0660
     ${cfg.extraConfig}
@@ -61,11 +62,6 @@ in {
       default = false;
       description = "Announce clightning Tor Hidden Service";
     };
-    bitcoin-rpcconnect = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      description = "The bitcoind RPC host to connect to.";
-    };
     dataDir = mkOption {
       type = types.path;
       default = "/var/lib/clightning";
diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix
index a85d3db..07360be 100644
--- a/modules/netns-isolation.nix
+++ b/modules/netns-isolation.nix
@@ -267,10 +267,7 @@ in {
     };
     systemd.services.bitcoind-import-banlist.serviceConfig.NetworkNamespacePath = "/var/run/netns/nb-bitcoind";
 
-    services.clightning = {
-      bitcoin-rpcconnect = netns.bitcoind.address;
-      bind-addr = netns.clightning.address;
-    };
+    services.clightning.bind-addr = netns.clightning.address;
 
     services.lnd = {
       listen = netns.lnd.address;