Rename graffiti management directory

Author: courtneyeh

Diff for: validator/api/src/main/java/tech/pegasys/teku/validator/api/GraffitiManager.java

@@ -24,7 +24,7 @@
 import tech.pegasys.teku.service.serviceutils.layout.DataDirLayout;
 
 public class GraffitiManager {
-  static final String GRAFFITI_MANAGEMENT_DIR = "graffiti-management";
+  static final String GRAFFITI_DIR = "graffiti";
 
   private static final Logger LOG = LogManager.getLogger();
   private final Optional<Path> graffitiPath;
@@ -42,12 +42,11 @@ public Optional<String> deleteGraffiti(final BLSPublicKey publicKey) {
   }
 
   private Optional<Path> createManagementDirectory(final DataDirLayout dataDirLayout) {
-    final Path graffitiDirectory =
-        dataDirLayout.getValidatorDataDirectory().resolve(GRAFFITI_MANAGEMENT_DIR);
+    final Path graffitiDirectory = dataDirLayout.getValidatorDataDirectory().resolve(GRAFFITI_DIR);
     if (!graffitiDirectory.toFile().exists() && !graffitiDirectory.toFile().mkdirs()) {
       LOG.error(
           "Unable to create {} directory. Updating graffiti through the validator API is disabled.",
-          GRAFFITI_MANAGEMENT_DIR);
+          GRAFFITI_DIR);
       return Optional.empty();
     }
     return Optional.of(graffitiDirectory);
@@ -56,7 +55,7 @@ private Optional<Path> createManagementDirectory(final DataDirLayout dataDirLayo
   private Optional<String> updateGraffiti(
       final BLSPublicKey publicKey, final Supplier<byte[]> graffiti) {
     if (graffitiPath.isEmpty()) {
-      return Optional.of("graffiti-management directory does not exist to handle update.");
+      return Optional.of(GRAFFITI_DIR + " directory does not exist to handle update.");
     }
 
     try {

Diff for: validator/api/src/main/java/tech/pegasys/teku/validator/api/UpdatableGraffitiProvider.java

@@ -13,7 +13,7 @@
 
 package tech.pegasys.teku.validator.api;
 
-import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_MANAGEMENT_DIR;
+import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_DIR;
 
 import java.nio.file.Path;
 import java.util.Optional;
@@ -36,7 +36,7 @@ public UpdatableGraffitiProvider(
     this.graffitiPath =
         dataDirLayout
             .getValidatorDataDirectory()
-            .resolve(GRAFFITI_MANAGEMENT_DIR)
+            .resolve(GRAFFITI_DIR)
             .resolve(GraffitiManager.resolveFileName(publicKey));
     this.defaultProvider = defaultProvider;
   }

Diff for: validator/api/src/test/java/tech/pegasys/teku/validator/api/GraffitiManagerTest.java

@@ -15,7 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_MANAGEMENT_DIR;
+import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_DIR;
 
 import java.io.File;
 import java.io.IOException;
@@ -48,7 +48,7 @@ void setGraffiti_shouldThrowExceptionWhenNoDirectory(@TempDir final Path tempDir
 
     assertThat(getGraffitiManagementDir().toFile().exists()).isFalse();
     assertThat(manager.setGraffiti(dataStructureUtil.randomPublicKey(), graffiti))
-        .hasValue("graffiti-management directory does not exist to handle update.");
+        .hasValue(GRAFFITI_DIR + " directory does not exist to handle update.");
   }
 
   @Test
@@ -110,7 +110,7 @@ void deleteGraffiti_shouldThrowExceptionWhenNoDirectory(@TempDir final Path temp
 
     assertThat(getGraffitiManagementDir().toFile().exists()).isFalse();
     assertThat(manager.deleteGraffiti(dataStructureUtil.randomPublicKey()))
-        .hasValue("graffiti-management directory does not exist to handle update.");
+        .hasValue(GRAFFITI_DIR + " directory does not exist to handle update.");
   }
 
   @Test
@@ -177,7 +177,7 @@ private void checkGraffitiFile(final BLSPublicKey publicKey, final String graffi
   }
 
   private Path getGraffitiManagementDir() {
-    return dataDirLayout.getValidatorDataDirectory().resolve(GRAFFITI_MANAGEMENT_DIR);
+    return dataDirLayout.getValidatorDataDirectory().resolve(GRAFFITI_DIR);
   }
 
   private String getFileName(final BLSPublicKey publicKey) {

Diff for: validator/api/src/test/java/tech/pegasys/teku/validator/api/UpdatableGraffitiProviderTest.java

@@ -14,7 +14,7 @@
 package tech.pegasys.teku.validator.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_MANAGEMENT_DIR;
+import static tech.pegasys.teku.validator.api.GraffitiManager.GRAFFITI_DIR;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -90,7 +90,7 @@ void get_shouldUseDefaultWhenFileNotReadable(@TempDir final Path tempDir) throws
     final Path path =
         dataDirLayout
             .getValidatorDataDirectory()
-            .resolve(GRAFFITI_MANAGEMENT_DIR)
+            .resolve(GRAFFITI_DIR)
             .resolve(GraffitiManager.resolveFileName(publicKey));
     final Bytes32 storedGraffiti = Bytes32Parser.toBytes32("Test graffiti");
     assertThat(path.getParent().toFile().mkdirs()).isTrue();
@@ -114,7 +114,7 @@ private void storeGraffiti(final BLSPublicKey publicKey, final Bytes graffiti)
     final Path path =
         dataDirLayout
             .getValidatorDataDirectory()
-            .resolve(GRAFFITI_MANAGEMENT_DIR)
+            .resolve(GRAFFITI_DIR)
             .resolve(GraffitiManager.resolveFileName(publicKey));
     assertThat(path.getParent().toFile().mkdirs()).isTrue();
     Files.write(path, graffiti.toArray());