treefmt-check
x86_64-linux.treefmt
· build #21
· raw
1treefmt v2.5.0traversed 67 files2emitted 64 files for processing3formatted 64 files (3 changed) in 411ms4 M clanServices/dvt/roles/ecl/adapters.unit.nix5 M clanServices/dvt/roles/ecl/lighthouse.nix6 M clanServices/dvt/tests/lib.nix7diff --git a/clanServices/dvt/roles/ecl/adapters.unit.nix b/clanServices/dvt/roles/ecl/adapters.unit.nix8index d5f499f..14bb95e 1006449--- a/clanServices/dvt/roles/ecl/adapters.unit.nix10+++ b/clanServices/dvt/roles/ecl/adapters.unit.nix11@@ -52,7 +52,8 @@ let12 nethermindFor =13 overrides: (evalAdapter ./nethermind.nix (mkSettings overrides)).services.nethermind.test;14 lighthouseFor =15- overrides: (evalAdapter ./lighthouse.nix (mkSettings overrides)).services.ethereum.lighthouse-beacon.test;16+ overrides:17+ (evalAdapter ./lighthouse.nix (mkSettings overrides)).services.ethereum.lighthouse-beacon.test;18 in19 {20 teku = {21@@ -193,17 +194,19 @@ in22 };23 24 "test checkpointSyncUrl is passed through from the clan service" = {25- expr = builtins.elem "--checkpoint-sync-url=https://checkpoint.example" (26- lighthouseFor {27- network = "hoodi";28- beacon.checkpointSyncUrl = "https://checkpoint.example";29- }30- ).extraArgs;31+ expr =32+ builtins.elem "--checkpoint-sync-url=https://checkpoint.example"33+ (lighthouseFor {34+ network = "hoodi";35+ beacon.checkpointSyncUrl = "https://checkpoint.example";36+ }).extraArgs;37 expected = true;38 };39 40 "test unset checkpointSyncUrl adds no checkpoint flag to extraArgs" = {41- expr = builtins.any (lib.hasPrefix "--checkpoint-sync-url") (lighthouseFor { network = "hoodi"; }).extraArgs;42+ expr =43+ builtins.any (lib.hasPrefix "--checkpoint-sync-url")44+ (lighthouseFor { network = "hoodi"; }).extraArgs;45 expected = false;46 };47 };48diff --git a/clanServices/dvt/roles/ecl/lighthouse.nix b/clanServices/dvt/roles/ecl/lighthouse.nix49index ba0fad6..8a10d3c 10064450--- a/clanServices/dvt/roles/ecl/lighthouse.nix51+++ b/clanServices/dvt/roles/ecl/lighthouse.nix52@@ -32,7 +32,7 @@ in53 http = {54 enable = true;55 address = "::";56- port = settings.beacon.rest.port;57+ inherit (settings.beacon.rest) port;58 };59 60 metrics = {61@@ -41,22 +41,21 @@ in62 };63 };64 65- extraArgs =66- [67- "--port=${toString settings.beacon.p2p.port}"68- "--subscribe-all-subnets"69- ]70- ++ lib.optionals (settings.beacon.p2p.maxPeers != null) [71- "--target-peers=${toString settings.beacon.p2p.maxPeers}"72- ]73- ++ lib.optionals74- (settings.beacon.p2p.nat != null && lib.hasPrefix "extip:" settings.beacon.p2p.nat)75+ extraArgs = [76+ "--port=${toString settings.beacon.p2p.port}"77+ "--subscribe-all-subnets"78+ ]79+ ++ lib.optionals (settings.beacon.p2p.maxPeers != null) [80+ "--target-peers=${toString settings.beacon.p2p.maxPeers}"81+ ]82+ ++83+ lib.optionals (settings.beacon.p2p.nat != null && lib.hasPrefix "extip:" settings.beacon.p2p.nat)84 [85 "--enr-address=${lib.removePrefix "extip:" settings.beacon.p2p.nat}"86 ]87- ++ lib.optionals (settings.beacon.checkpointSyncUrl != null) [88- "--checkpoint-sync-url=${settings.beacon.checkpointSyncUrl}"89- ];90+ ++ lib.optionals (settings.beacon.checkpointSyncUrl != null) [91+ "--checkpoint-sync-url=${settings.beacon.checkpointSyncUrl}"92+ ];93 };94 95 environment.etc."alloy/dvt-lighthouse-beacon.alloy".text = ''96diff --git a/clanServices/dvt/tests/lib.nix b/clanServices/dvt/tests/lib.nix97index 4d6a02b..980996c 10064498--- a/clanServices/dvt/tests/lib.nix99+++ b/clanServices/dvt/tests/lib.nix100@@ -925,7 +925,8 @@ in101 # is /ip4/203.0.113.7/tcp/9000 for every entry (all ECL nodes share this102 # test NAT IP), which is unreachable inside the QEMU VM network — actual CL103 # inter-node peering does not occur. Each node starts with a stable identity.104- settings.beacon.p2p.staticPeers = clPackage != "nimbus" && clPackage != "lodestar" && clPackage != "lighthouse";105+ settings.beacon.p2p.staticPeers =106+ clPackage != "nimbus" && clPackage != "lodestar" && clPackage != "lighthouse";107 settings.beacon.p2p.directPeering = clPackage == "lodestar";108 # Port must match the chosen CL client's REST API port109 settings.beacon.rest.port = cl.restPortInventorySetting;