mirror of
https://github.com/fort-nix/nix-bitcoin.git
synced 2024-11-22 22:33:46 +03:00
bitcoind, clightning, run-tests: minor refactoring
bitcoind: use builtins.toFile clightning: use boolToString run-tests: remove leftover var
This commit is contained in:
parent
41fe9b0c1d
commit
7533f12ef1
@ -7,7 +7,7 @@ let
|
||||
nbLib = config.nix-bitcoin.lib;
|
||||
secretsDir = config.nix-bitcoin.secretsDir;
|
||||
|
||||
configFile = pkgs.writeText "bitcoin.conf" ''
|
||||
configFile = builtins.toFile "bitcoin.conf" ''
|
||||
# We're already logging via journald
|
||||
nodebuglogfile=1
|
||||
|
||||
|
@ -11,7 +11,7 @@ let
|
||||
network=${network}
|
||||
bitcoin-datadir=${config.services.bitcoind.dataDir}
|
||||
${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"}
|
||||
always-use-proxy=${if cfg.always-use-proxy then "true" else "false"}
|
||||
always-use-proxy=${boolToString cfg.always-use-proxy}
|
||||
bind-addr=${cfg.address}:${toString cfg.port}
|
||||
bitcoin-rpcconnect=${config.services.bitcoind.rpc.address}
|
||||
bitcoin-rpcport=${toString config.services.bitcoind.rpc.port}
|
||||
|
@ -172,7 +172,7 @@ doBuild() {
|
||||
|
||||
# Run the test by building the test derivation
|
||||
buildTest() {
|
||||
vmTestNixExpr | doBuild $scenario $outLinkArg "$@" -
|
||||
vmTestNixExpr | doBuild $scenario "$@" -
|
||||
}
|
||||
|
||||
vmTestNixExpr() {
|
||||
|
Loading…
Reference in New Issue
Block a user