Don't initialise GraffitiManager if api not enabled

courtneyeh · Apr 19, 2024 · 4656de9 · 4656de9
1 parent 4f55037
commit 4656de9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...dator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java b/...dator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java
@@ -158,15 +158,17 @@ public static ValidatorClientService create(
     final ForkProvider forkProvider = new ForkProvider(config.getSpec(), genesisDataProvider);
 
     final ValidatorRestApiConfig validatorApiConfig = config.getValidatorRestApiConfig();
-    final GraffitiManager graffitiManager = new GraffitiManager(services.getDataDirLayout());
+    final Optional<GraffitiManager> graffitiManager =
+        Optional.ofNullable(
+            validatorApiConfig.isRestApiEnabled()
+                ? new GraffitiManager(services.getDataDirLayout())
+                : null);
     final ValidatorLoader validatorLoader =
         createValidatorLoader(
             services,
             config,
             asyncRunner,
-            validatorApiConfig.isRestApiEnabled()
-                ? graffitiManager::getGraffiti
-                : (publicKey) -> Optional.empty());
+            (publicKey) -> graffitiManager.flatMap(manager -> manager.getGraffiti(publicKey)));
     final ValidatorStatusProvider validatorStatusProvider =
         new OwnedValidatorStatusProvider(
             services.getMetricsSystem(),