Check network on start and reset db

services/chainstorage/src/main/java/tech/pegasys/teku/services/chainstorage/EphemeryDatabaseReset.java

@@ -27,8 +27,7 @@ public class EphemeryDatabaseReset {
   Database resetDatabaseAndCreate(
       final ServiceConfig serviceConfig, final VersionedDatabaseFactory dbFactory) {
     try {
-      final Path beaconDataDir =
-          serviceConfig.getDataDirLayout().getBeaconDataDirectory().getParent();
+      final Path beaconDataDir = serviceConfig.getDataDirLayout().getBeaconDataDirectory();
       final Path dbDataDir = beaconDataDir.resolve("db");
       final Path networkFile = beaconDataDir.resolve("network.yml");
       final Path validatorDataDir = serviceConfig.getDataDirLayout().getValidatorDataDirectory();
@@ -38,8 +37,13 @@ Database resetDatabaseAndCreate(
       } else {
         slashProtectionDir = validatorDataDir.resolve("slashprotection");
       }
+
+      System.out.println("beaconDir" + beaconDataDir);
+      System.out.println("networkFile" + networkFile);
+      System.out.println("dbdir" + dbDataDir);
+
       deleteDirectoryRecursively(dbDataDir);
-      deleteFile(networkFile);
+      deleteDirectoryRecursively(networkFile);
       deleteDirectoryRecursively(slashProtectionDir);
       return dbFactory.createDatabase();
     } catch (final Exception ex) {
@@ -48,25 +52,27 @@ Database resetDatabaseAndCreate(
     }
   }
 
-  void deleteFile(final Path path) throws IOException {
-    if (Files.exists(path)) {
-      Files.delete(path);
-    }
-  }
-
   void deleteDirectoryRecursively(final Path path) throws IOException {
-    if (Files.isDirectory(path)) {
-      try (var stream = Files.walk(path)) {
-        stream
-            .sorted((o1, o2) -> o2.compareTo(o1))
-            .forEach(
-                p -> {
-                  try {
-                    Files.delete(p);
-                  } catch (IOException e) {
-                    throw new RuntimeException("Failed to delete file: " + p, e);
-                  }
-                });
+    if (Files.exists(path)) {
+      if (Files.isDirectory(path)) {
+        try (var stream = Files.walk(path)) {
+          stream
+              .sorted((o1, o2) -> o2.compareTo(o1))
+              .forEach(
+                  p -> {
+                    try {
+                      Files.delete(p);
+                    } catch (IOException e) {
+                      throw new RuntimeException("Failed to delete file/directory: " + p, e);
+                    }
+                  });
+        }
+      } else {
+        try {
+          Files.delete(path);
+        } catch (IOException e) {
+          throw new RuntimeException("Failed to delete file: " + path, e);
+        }
       }
     }
   }

services/chainstorage/src/main/java/tech/pegasys/teku/services/chainstorage/StorageService.java

@@ -86,14 +86,13 @@ protected SafeFuture<?> doStart() {
                       serviceConfig.getMetricsSystem(),
                       serviceConfig.getDataDirLayout().getBeaconDataDirectory(),
                       config);
-
               try {
                 database = dbFactory.createDatabase();
               } catch (EphemeryException e) {
                 final EphemeryDatabaseReset ephemeryDatabaseReset = new EphemeryDatabaseReset();
-                database = ephemeryDatabaseReset.resetDatabaseAndCreate(serviceConfig, dbFactory);
                 LOG.warn(
                     "Ephemery network deposit contract id has updated, resetting the stored database and slashing protection data.");
+                database = ephemeryDatabaseReset.resetDatabaseAndCreate(serviceConfig, dbFactory);
               }
               final SettableLabelledGauge pruningTimingsLabelledGauge =
                   SettableLabelledGauge.create(

services/chainstorage/src/test/java/tech/pegasys/teku/services/chainstorage/EphemeryDatabaseResetTest.java

@@ -22,15 +22,14 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import tech.pegasys.teku.infrastructure.exceptions.InvalidConfigurationException;
@@ -49,26 +48,27 @@ class EphemeryDatabaseResetTest {
   private Path beaconDataDir;
   private Path dbDataDir;
   private Path resolvedSlashProtectionDir;
-  private File networkFile;
+  private Path networkFilePath;
   @Mock private Database database;
 
-  @InjectMocks private EphemeryDatabaseReset ephemeryDatabaseReset;
+  @Mock private EphemeryDatabaseReset ephemeryDatabaseReset;
 
   @BeforeEach
   void setUp() throws IOException {
     MockitoAnnotations.openMocks(this);
     ephemeryDatabaseReset = spy(new EphemeryDatabaseReset());
-    beaconDataDir = createTempDirectory("beaconDataDir");
+    beaconDataDir = createTempDirectory("beacon");
     dbDataDir = beaconDataDir.resolve("db");
-    networkFile = new File(beaconDataDir.toFile(), "network.yml");
-    final Path validatorDataDir = createTempDirectory("validatorDataDir");
+    Files.createDirectory(dbDataDir);
+    Path networkFile = beaconDataDir.resolve("network.yml");
+    Files.createFile(networkFile);
+    networkFilePath = networkFile;
+
+    final Path validatorDataDir = createTempDirectory("validator");
     resolvedSlashProtectionDir = validatorDataDir.resolve("slashprotection");
 
     when(serviceConfig.getDataDirLayout()).thenReturn(dataDirLayout);
     when(dataDirLayout.getBeaconDataDirectory()).thenReturn(beaconDataDir);
-    when(dataDirLayout.getBeaconDataDirectory().resolve("db")).thenReturn(dbDataDir);
-    when(dataDirLayout.getBeaconDataDirectory().resolve("network.yml"))
-        .thenReturn(networkFile.toPath());
     when(dataDirLayout.getValidatorDataDirectory()).thenReturn(validatorDataDir);
     when(dataDirLayout.getValidatorDataDirectory().resolve("slashprotection"))
         .thenReturn(resolvedSlashProtectionDir);
@@ -85,8 +85,12 @@ void shouldResetSpecificDirectoriesAndCreateDatabase() throws IOException {
 
     final Database result = ephemeryDatabaseReset.resetDatabaseAndCreate(serviceConfig, dbFactory);
     verify(ephemeryDatabaseReset).deleteDirectoryRecursively(dbDataDir);
-    verify(ephemeryDatabaseReset).deleteFile(networkFile.toPath());
+    verify(ephemeryDatabaseReset).deleteDirectoryRecursively(networkFilePath);
     verify(ephemeryDatabaseReset).deleteDirectoryRecursively(resolvedSlashProtectionDir);
+
+    verify(dbFactory).createDatabase();
+    verifyNoMoreInteractions(dbFactory);
+
     assertTrue(Files.exists(kvStoreDir));
     assertTrue(Files.exists(dbVersion));
     assertEquals(database, result);