From be2127ae5be17b89868ff98f3df4c25bfbf4a8d6 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 27 Sep 2020 12:43:21 +0200
Subject: [PATCH] test: fix noConnections configs

- bitcoind: remove mkForce because otherwise the whole extraConfig is replaced
  by the value of mkForce.

- liquidd: don't disable 'listen' because it is entirely benign in offline
  mode, we also allow it for bitcoind.
---
 test/tests.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/tests.nix b/test/tests.nix
index 945d319..cb8aa4e 100644
--- a/test/tests.nix
+++ b/test/tests.nix
@@ -19,7 +19,7 @@ let testEnv = rec {
       tests.bitcoind = cfg.bitcoind.enable;
       services.bitcoind = {
         enable = true;
-        extraConfig = mkIf config.test.noConnections (mkForce "connect=0");
+        extraConfig = mkIf config.test.noConnections "connect=0";
       };
 
       tests.clightning = cfg.clightning.enable;
@@ -36,10 +36,7 @@ let testEnv = rec {
       tests.electrs = cfg.electrs.enable;
 
       tests.liquidd = cfg.liquidd.enable;
-      services.liquidd = optionalAttrs config.test.noConnections {
-        listen = mkForce false;
-        extraConfig = "noconnect=1";
-      };
+      services.liquidd.extraConfig = mkIf config.test.noConnections "connect=0";
 
       tests.btcpayserver = cfg.btcpayserver.enable;
       services.btcpayserver.lightningBackend = "lnd";