Skip to content

Commit 78d3daf

Browse files
committed
Remove unnecessary exception catch after refactor
1 parent 9dd7586 commit 78d3daf

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public Optional<Bytes32> getGraffitiFromStorage(final BLSPublicKey publicKey) {
9191
final Path filePath = graffitiPath.get().resolve(resolveFileName(publicKey));
9292
try {
9393
return Optional.of(GraffitiParser.loadFromFile(filePath)).filter(this::graffitiNotEmpty);
94-
} catch (GraffitiLoaderException | IllegalArgumentException e) {
94+
} catch (GraffitiLoaderException e) {
9595
LOG.error("Unable to read graffiti from storage.", e);
9696
return Optional.empty();
9797
}

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ void setGraffiti_shouldSetGraffitiWhenFileNotExist(@TempDir final Path tempDir)
6767
void setGraffiti_shouldSetGraffitiWhenFileExist(@TempDir final Path tempDir) throws IOException {
6868
dataDirLayout = new SimpleDataDirLayout(tempDir);
6969
manager = new GraffitiManager(dataDirLayout);
70-
7170
assertThat(getGraffitiManagementDir().resolve(getFileName(publicKey)).toFile().createNewFile())
7271
.isTrue();
7372

@@ -81,6 +80,7 @@ void setGraffiti_shouldReturnErrorMessageWhenUnableToWriteFile(@TempDir final Pa
8180
throws IOException {
8281
dataDirLayout = new SimpleDataDirLayout(tempDir);
8382
manager = new GraffitiManager(dataDirLayout);
83+
assertThat(getGraffitiManagementDir().toFile().exists()).isTrue();
8484

8585
final File file = getGraffitiManagementDir().resolve(getFileName(publicKey)).toFile();
8686
assertThat(file.createNewFile()).isTrue();
@@ -108,7 +108,6 @@ void deleteGraffiti_shouldThrowExceptionWhenNoDirectory(@TempDir final Path temp
108108
assertThat(tempDir.toFile().setWritable(false)).isTrue();
109109
dataDirLayout = new SimpleDataDirLayout(tempDir);
110110
manager = new GraffitiManager(dataDirLayout);
111-
112111
assertThat(getGraffitiManagementDir().toFile().exists()).isFalse();
113112
assertThat(manager.deleteGraffiti(dataStructureUtil.randomPublicKey()))
114113
.hasValue(GRAFFITI_DIR + " directory does not exist to handle update.");
@@ -119,7 +118,6 @@ void deleteGraffiti_shouldSetGraffitiWhenFileNotExist(@TempDir final Path tempDi
119118
dataDirLayout = new SimpleDataDirLayout(tempDir);
120119
manager = new GraffitiManager(dataDirLayout);
121120
assertThat(getGraffitiManagementDir().toFile().exists()).isTrue();
122-
123121
assertThat(manager.deleteGraffiti(publicKey)).isEmpty();
124122
checkStoredGraffitiFile(publicKey, "");
125123
}
@@ -129,7 +127,6 @@ void deleteGraffiti_shouldSetGraffitiWhenFileExist(@TempDir final Path tempDir)
129127
throws IOException {
130128
dataDirLayout = new SimpleDataDirLayout(tempDir);
131129
manager = new GraffitiManager(dataDirLayout);
132-
133130
assertThat(getGraffitiManagementDir().resolve(getFileName(publicKey)).toFile().createNewFile())
134131
.isTrue();
135132

@@ -156,7 +153,6 @@ void shouldSetAndDeleteGraffitiWhenManagementPreexisting(@TempDir final Path tem
156153
dataDirLayout = new SimpleDataDirLayout(tempDir);
157154
final Path managementDir = getGraffitiManagementDir();
158155
assertThat(managementDir.toFile().mkdirs()).isTrue();
159-
160156
manager = new GraffitiManager(dataDirLayout);
161157

162158
assertThat(manager.setGraffiti(publicKey, graffiti)).isEmpty();

0 commit comments

Comments
 (0)