treefmt v2.5.0traversed 67 files
emitted 64 files for processing
formatted 64 files (3 changed) in 411ms
 M clanServices/dvt/roles/ecl/adapters.unit.nix
 M clanServices/dvt/roles/ecl/lighthouse.nix
 M clanServices/dvt/tests/lib.nix
diff --git a/clanServices/dvt/roles/ecl/adapters.unit.nix b/clanServices/dvt/roles/ecl/adapters.unit.nix
index d5f499f..14bb95e 100644
--- a/clanServices/dvt/roles/ecl/adapters.unit.nix
+++ b/clanServices/dvt/roles/ecl/adapters.unit.nix
@@ -52,7 +52,8 @@ let
   nethermindFor =
     overrides: (evalAdapter ./nethermind.nix (mkSettings overrides)).services.nethermind.test;
   lighthouseFor =
-    overrides: (evalAdapter ./lighthouse.nix (mkSettings overrides)).services.ethereum.lighthouse-beacon.test;
+    overrides:
+    (evalAdapter ./lighthouse.nix (mkSettings overrides)).services.ethereum.lighthouse-beacon.test;
 in
 {
   teku = {
@@ -193,17 +194,19 @@ in
     };
 
     "test checkpointSyncUrl is passed through from the clan service" = {
-      expr = builtins.elem "--checkpoint-sync-url=https://checkpoint.example" (
-        lighthouseFor {
-          network = "hoodi";
-          beacon.checkpointSyncUrl = "https://checkpoint.example";
-        }
-      ).extraArgs;
+      expr =
+        builtins.elem "--checkpoint-sync-url=https://checkpoint.example"
+          (lighthouseFor {
+            network = "hoodi";
+            beacon.checkpointSyncUrl = "https://checkpoint.example";
+          }).extraArgs;
       expected = true;
     };
 
     "test unset checkpointSyncUrl adds no checkpoint flag to extraArgs" = {
-      expr = builtins.any (lib.hasPrefix "--checkpoint-sync-url") (lighthouseFor { network = "hoodi"; }).extraArgs;
+      expr =
+        builtins.any (lib.hasPrefix "--checkpoint-sync-url")
+          (lighthouseFor { network = "hoodi"; }).extraArgs;
       expected = false;
     };
   };
diff --git a/clanServices/dvt/roles/ecl/lighthouse.nix b/clanServices/dvt/roles/ecl/lighthouse.nix
index ba0fad6..8a10d3c 100644
--- a/clanServices/dvt/roles/ecl/lighthouse.nix
+++ b/clanServices/dvt/roles/ecl/lighthouse.nix
@@ -32,7 +32,7 @@ in
       http = {
         enable = true;
         address = "::";
-        port = settings.beacon.rest.port;
+        inherit (settings.beacon.rest) port;
       };
 
       metrics = {
@@ -41,22 +41,21 @@ in
       };
     };
 
-    extraArgs =
-      [
-        "--port=${toString settings.beacon.p2p.port}"
-        "--subscribe-all-subnets"
-      ]
-      ++ lib.optionals (settings.beacon.p2p.maxPeers != null) [
-        "--target-peers=${toString settings.beacon.p2p.maxPeers}"
-      ]
-      ++ lib.optionals
-        (settings.beacon.p2p.nat != null && lib.hasPrefix "extip:" settings.beacon.p2p.nat)
+    extraArgs = [
+      "--port=${toString settings.beacon.p2p.port}"
+      "--subscribe-all-subnets"
+    ]
+    ++ lib.optionals (settings.beacon.p2p.maxPeers != null) [
+      "--target-peers=${toString settings.beacon.p2p.maxPeers}"
+    ]
+    ++
+      lib.optionals (settings.beacon.p2p.nat != null && lib.hasPrefix "extip:" settings.beacon.p2p.nat)
         [
           "--enr-address=${lib.removePrefix "extip:" settings.beacon.p2p.nat}"
         ]
-      ++ lib.optionals (settings.beacon.checkpointSyncUrl != null) [
-        "--checkpoint-sync-url=${settings.beacon.checkpointSyncUrl}"
-      ];
+    ++ lib.optionals (settings.beacon.checkpointSyncUrl != null) [
+      "--checkpoint-sync-url=${settings.beacon.checkpointSyncUrl}"
+    ];
   };
 
   environment.etc."alloy/dvt-lighthouse-beacon.alloy".text = ''
diff --git a/clanServices/dvt/tests/lib.nix b/clanServices/dvt/tests/lib.nix
index 4d6a02b..980996c 100644
--- a/clanServices/dvt/tests/lib.nix
+++ b/clanServices/dvt/tests/lib.nix
@@ -925,7 +925,8 @@ in
               # is /ip4/203.0.113.7/tcp/9000 for every entry (all ECL nodes share this
               # test NAT IP), which is unreachable inside the QEMU VM network — actual CL
               # inter-node peering does not occur. Each node starts with a stable identity.
-              settings.beacon.p2p.staticPeers = clPackage != "nimbus" && clPackage != "lodestar" && clPackage != "lighthouse";
+              settings.beacon.p2p.staticPeers =
+                clPackage != "nimbus" && clPackage != "lodestar" && clPackage != "lighthouse";
               settings.beacon.p2p.directPeering = clPackage == "lodestar";
               # Port must match the chosen CL client's REST API port
               settings.beacon.rest.port = cl.restPortInventorySetting;