Take default when storage graffiti is empty

courtneyeh · courtneyeh · commit 4861a1441e9c · 2024-04-18T14:48:49.000+10:00
diff --git a/validator/api/src/main/java/tech/pegasys/teku/validator/api/UpdatableGraffitiProvider.java b/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().or(defaultProvider::get).filter(this::graffitiNotEmpty);
+    return getGraffitiFromStorage().filter(this::graffitiNotEmpty).or(defaultProvider::get);
   }
 
   private Optional<Bytes32> getGraffitiFromStorage() {
diff --git a/validator/api/src/test/java/tech/pegasys/teku/validator/api/UpdatableGraffitiProviderTest.java b/validator/api/src/test/java/tech/pegasys/teku/validator/api/UpdatableGraffitiProviderTest.java
@@ -101,12 +101,13 @@ void get_shouldUseDefaultWhenFileNotReadable(@TempDir final Path tempDir) throws
   }
 
   @Test
-  void get_shouldReturnEmptyWhenEmptyFileAvailable(@TempDir final Path tempDir) throws IOException {
+  void get_shouldReturnDefaultWhenEmptyFileAvailable(@TempDir final Path tempDir)
+      throws IOException {
     dataDirLayout = new SimpleDataDirLayout(tempDir);
     provider = new UpdatableGraffitiProvider(dataDirLayout, publicKey, defaultProvider);
     storeGraffiti(publicKey, Bytes32.EMPTY);
 
-    assertThat(provider.get()).isEmpty();
+    assertThat(provider.get()).hasValue(defaultGraffiti);
   }
 
   private void storeGraffiti(final BLSPublicKey publicKey, final Bytes graffiti)

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public UpdatableGraffitiProvider(`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`public Optional<Bytes32> get() {`
`46`		`- return getGraffitiFromStorage().or(defaultProvider::get).filter(this::graffitiNotEmpty);`
	`46`	`+ return getGraffitiFromStorage().filter(this::graffitiNotEmpty).or(defaultProvider::get);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private Optional<Bytes32> getGraffitiFromStorage() {`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,13 @@ void get_shouldUseDefaultWhenFileNotReadable(@TempDir final Path tempDir) throws`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Test`
`104`		`- void get_shouldReturnEmptyWhenEmptyFileAvailable(@TempDir final Path tempDir) throws IOException {`
	`104`	`+ void get_shouldReturnDefaultWhenEmptyFileAvailable(@TempDir final Path tempDir)`
	`105`	`+ throws IOException {`
`105`	`106`	`dataDirLayout = new SimpleDataDirLayout(tempDir);`
`106`	`107`	`provider = new UpdatableGraffitiProvider(dataDirLayout, publicKey, defaultProvider);`
`107`	`108`	`storeGraffiti(publicKey, Bytes32.EMPTY);`
`108`	`109`
`109`		`- assertThat(provider.get()).isEmpty();`
	`110`	`+ assertThat(provider.get()).hasValue(defaultGraffiti);`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`private void storeGraffiti(final BLSPublicKey publicKey, final Bytes graffiti)`