Cli option to specify Hikari configuration for pruning db connection (#…

…663)

* Added cli option `--slashing-protection-pruning-db-pool-configuration-file`

.gitignore

@@ -28,3 +28,4 @@ out/
 docker/reports/*
 .vscode
 .lh/*
+.fleet/

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Next Release
+
+### Features Added
+- Introduced cli option to specify Hikari configuration for pruning database connection [#661](https://github.com/ConsenSys/web3signer/issues/661)
+
 ## 22.10.0
 
 ### Features Added

commandline/src/main/java/tech/pegasys/web3signer/commandline/PicoCliSlashingProtectionParameters.java

@@ -55,6 +55,13 @@ public class PicoCliSlashingProtectionParameters implements SlashingProtectionPa
       paramLabel = "<hikari configuration properties file>")
   private Path dbPoolConfigurationFile = null;
 
+  @Option(
+      names = "--slashing-protection-pruning-db-pool-configuration-file",
+      description =
+          "Optional configuration file for Hikari database connection pool used by pruning process.",
+      paramLabel = "<hikari configuration properties file>")
+  private Path pruningDbPoolConfigurationFile = null;
+
   @Option(
       names = {"--slashing-protection-pruning-enabled"},
       description =
@@ -133,6 +140,11 @@ public Path getDbPoolConfigurationFile() {
     return dbPoolConfigurationFile;
   }
 
+  @Override
+  public Path getPruningDbPoolConfigurationFile() {
+    return pruningDbPoolConfigurationFile;
+  }
+
   @Override
   public boolean isPruningEnabled() {
     return pruningEnabled;

slashing-protection/src/main/java/tech/pegasys/web3signer/slashingprotection/SlashingProtectionContextFactory.java

@@ -41,7 +41,7 @@ public static SlashingProtectionContext create(
             slashingProtectionParameters.getDbUrl(),
             slashingProtectionParameters.getDbUsername(),
             slashingProtectionParameters.getDbPassword(),
-            slashingProtectionParameters.getDbPoolConfigurationFile());
+            slashingProtectionParameters.getPruningDbPoolConfigurationFile());
 
     final ValidatorsDao validatorsDao = new ValidatorsDao();
     final RegisteredValidators registeredValidators = new RegisteredValidators(jdbi, validatorsDao);

slashing-protection/src/main/java/tech/pegasys/web3signer/slashingprotection/SlashingProtectionParameters.java

@@ -27,6 +27,8 @@ public interface SlashingProtectionParameters {
 
   Path getDbPoolConfigurationFile();
 
+  Path getPruningDbPoolConfigurationFile();
+
   boolean isPruningEnabled();
 
   long getPruningEpochsToKeep();

slashing-protection/src/testFixtures/java/dsl/TestSlashingProtectionParameters.java

@@ -29,6 +29,8 @@ public class TestSlashingProtectionParameters implements SlashingProtectionParam
   private final long pruningInterval;
   private final Path dbPoolConfigurationFile;
 
+  private final Path pruningDbPoolConfigurationFile;
+
   private final int dbHealthCheckTimeoutMilliseconds;
 
   private final int dbHealthCheckIntervalMilliseconds;
@@ -38,14 +40,6 @@ public TestSlashingProtectionParameters(
     this(dbUrl, dbUser, dbPassword, 0, 0);
   }
 
-  public TestSlashingProtectionParameters(
-      final String dbUrl,
-      final String dbUser,
-      final String dbPassword,
-      Path dbPoolConfigurationFile) {
-    this(dbUrl, dbUser, dbPassword, dbPoolConfigurationFile, 0, 0, Long.MAX_VALUE, 3000, 3000);
-  }
-
   public TestSlashingProtectionParameters(
       final String dbUrl,
       final String dbUser,
@@ -67,6 +61,7 @@ public TestSlashingProtectionParameters(
         dbUser,
         dbPassword,
         null,
+        null,
         pruningEpochsToKeep,
         pruningSlotsPerEpoch,
         pruningInterval,
@@ -79,6 +74,7 @@ public TestSlashingProtectionParameters(
       final String dbUser,
       final String dbPassword,
       final Path dbPoolConfigurationFile,
+      final Path pruningDbPoolConfigurationFile,
       final int pruningEpochsToKeep,
       final int pruningSlotsPerEpoch,
       final long pruningInterval,
@@ -88,6 +84,7 @@ public TestSlashingProtectionParameters(
     this.dbUser = dbUser;
     this.dbPassword = dbPassword;
     this.dbPoolConfigurationFile = dbPoolConfigurationFile;
+    this.pruningDbPoolConfigurationFile = pruningDbPoolConfigurationFile;
     this.pruningEnabled = true;
     this.pruningAtBootEnabled = true;
     this.pruningEpochsToKeep = pruningEpochsToKeep;
@@ -147,6 +144,11 @@ public Path getDbPoolConfigurationFile() {
     return dbPoolConfigurationFile;
   }
 
+  @Override
+  public Path getPruningDbPoolConfigurationFile() {
+    return pruningDbPoolConfigurationFile;
+  }
+
   @Override
   public boolean isPruningAtBootEnabled() {
     return pruningAtBootEnabled;