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.
This commit is contained in:
Erik Arvstedt 2020-09-27 12:43:21 +02:00
parent 1e18d3ea3b
commit be2127ae5b
No known key found for this signature in database
GPG Key ID: 33312B944DD97846

View File

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