greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electrs: use dataDir for storing extra config

Browse Source 
This is simpler and more memory-efficient.
We've also changed other services to use this appraoch.

Also remove unneded `wait_for_unit` in the electrs regtest test.
This commit is contained in:
Erik Arvstedt 2021-11-26 15:13:36 +01:00
parent 9bda7305fd
commit 62a2602e78
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/electrs.nix
View File

@ -74,10 +74,8 @@ in {
> electrs.toml > electrs.toml
''; '';
serviceConfig = nbLib.defaultHardening // { serviceConfig = nbLib.defaultHardening // {
RuntimeDirectory = "electrs";
RuntimeDirectoryMode = "700";
# electrs only uses the working directory for reading electrs.toml # electrs only uses the working directory for reading electrs.toml
WorkingDirectory = "/run/electrs"; WorkingDirectory = cfg.dataDir;
ExecStart = '' ExecStart = ''
${config.nix-bitcoin.pkgs.electrs}/bin/electrs -vv \ ${config.nix-bitcoin.pkgs.electrs}/bin/electrs -vv \
--network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \ --network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \

1
test/tests.py
View File

@ -375,7 +375,6 @@ def _():
num_blocks = test_data["num_blocks"] num_blocks = test_data["num_blocks"]
if enabled("electrs"): if enabled("electrs"):
machine.wait_for_unit("onion-addresses")
machine.wait_until_succeeds(log_has_string("electrs", "serving Electrum RPC")) machine.wait_until_succeeds(log_has_string("electrs", "serving Electrum RPC"))
get_block_height_cmd = ( get_block_height_cmd = (
"""echo '{"method": "blockchain.headers.subscribe", "id": 0, "params": []}'""" """echo '{"method": "blockchain.headers.subscribe", "id": 0, "params": []}'"""