Take CLI default when storage empty

Author: courtneyeh

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

@@ -43,7 +43,7 @@ public UpdatableGraffitiProvider(
 
   @Override
   public Optional<Bytes32> get() {
-    return getGraffitiFromStorage().filter(this::graffitiNotEmpty).or(defaultProvider::get);
+    return getGraffitiFromStorage().or(defaultProvider::get);
   }
 
   private Optional<Bytes32> getGraffitiFromStorage() {
@@ -52,7 +52,7 @@ private Optional<Bytes32> getGraffitiFromStorage() {
     }
 
     try {
-      return Optional.of(GraffitiParser.loadFromFile(graffitiPath));
+      return Optional.of(GraffitiParser.loadFromFile(graffitiPath)).filter(this::graffitiNotEmpty);
     } catch (GraffitiLoaderException | IllegalArgumentException e) {
       LOG.warn("Unable to read graffiti from storage", e);
       return Optional.empty();