Fix PublicKeysListHandler

core/src/main/java/tech/pegasys/web3signer/core/Eth1Runner.java

@@ -22,7 +22,6 @@
 import tech.pegasys.web3signer.core.routes.ReloadRoute;
 import tech.pegasys.web3signer.core.routes.eth1.Eth1SignRoute;
 import tech.pegasys.web3signer.core.routes.eth1.JsonRpcRoute;
-import tech.pegasys.web3signer.core.service.jsonrpc.handlers.HttpResponseFactory;
 import tech.pegasys.web3signer.keystorage.azure.AzureKeyVault;
 import tech.pegasys.web3signer.keystorage.common.MappedResults;
 import tech.pegasys.web3signer.keystorage.hashicorp.HashicorpConnectionFactory;
@@ -71,12 +70,8 @@
  *     address to primary key.
  */
 public class Eth1Runner extends Runner {
-  public static final String PUBLIC_KEYS_PATH = "/api/v1/eth1/publicKeys";
-  public static final String ROOT_PATH = "/";
-  public static final String SIGN_PATH = "/api/v1/eth1/sign/:identifier";
   private static final Logger LOG = LogManager.getLogger();
   private final Eth1Config eth1Config;
-  private final HttpResponseFactory responseFactory = new HttpResponseFactory();
 
   public Eth1Runner(final BaseConfig baseConfig, final Eth1Config eth1Config) {
     super(baseConfig);

core/src/main/java/tech/pegasys/web3signer/core/Runner.java

@@ -21,8 +21,8 @@
 import tech.pegasys.web3signer.core.config.MetricsPushOptions;
 import tech.pegasys.web3signer.core.config.TlsOptions;
 import tech.pegasys.web3signer.core.metrics.vertx.VertxMetricsAdapterFactory;
+import tech.pegasys.web3signer.core.routes.SwaggerUIRoute;
 import tech.pegasys.web3signer.core.service.http.HostAllowListHandler;
-import tech.pegasys.web3signer.core.service.http.SwaggerUIRoute;
 import tech.pegasys.web3signer.core.service.http.handlers.LogErrorHandler;
 import tech.pegasys.web3signer.core.service.http.handlers.UpcheckHandler;
 import tech.pegasys.web3signer.core.util.FileUtil;
@@ -78,7 +78,6 @@ public abstract class Runner implements Runnable, AutoCloseable {
   public static final String TEXT_PLAIN = HttpHeaderValues.TEXT_PLAIN.toString();
   public static final String HEALTHCHECK_PATH = "/healthcheck";
   public static final String UPCHECK_PATH = "/upcheck";
-  public static final String RELOAD_PATH = "/reload";
 
   private static final Logger LOG = LogManager.getLogger();
 

core/src/main/java/tech/pegasys/web3signer/core/service/http/SwaggerUIRoute.java → core/src/main/java/tech/pegasys/web3signer/core/routes/SwaggerUIRoute.java

@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.web3signer.core.service.http;
+package tech.pegasys.web3signer.core.routes;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -30,7 +30,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class SwaggerUIRoute {
+public class SwaggerUIRoute implements Web3SignerRoute {
   private static final Logger LOG = LogManager.getLogger();
   private static final String CONTENT_TYPE_TEXT_HTML = "text/html; charset=utf-8";
   private static final String SWAGGER_ENDPOINT = "/swagger-ui";
@@ -40,13 +40,19 @@ public SwaggerUIRoute(final Router router) {
     this.router = router;
   }
 
-  public void register() throws IOException {
+  @Override
+  public void register() {
     LOG.info("Registering /swagger-ui routes ...");
-    final OpenApiSpecsExtractor openApiSpecsExtractor =
-        new OpenApiSpecsExtractor.OpenApiSpecsExtractorBuilder()
-            .withConvertRelativeRefToAbsoluteRef(false)
-            .withForceDeleteOnJvmExit(true)
-            .build();
+    final OpenApiSpecsExtractor openApiSpecsExtractor;
+    try {
+      openApiSpecsExtractor =
+          new OpenApiSpecsExtractor.OpenApiSpecsExtractorBuilder()
+              .withConvertRelativeRefToAbsoluteRef(false)
+              .withForceDeleteOnJvmExit(true)
+              .build();
+    } catch (final IOException e) {
+      throw new UncheckedIOException(e);
+    }
 
     final Map<Path, String> swaggerUIWebRoot;
     swaggerUIWebRoot = loadSwaggerUIStaticContent(openApiSpecsExtractor);

core/src/main/java/tech/pegasys/web3signer/core/service/http/handlers/PublicKeysListHandler.java

@@ -17,24 +17,27 @@
 
 import tech.pegasys.web3signer.signing.ArtifactSignerProvider;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import io.vertx.core.Handler;
 import io.vertx.core.json.JsonArray;
 import io.vertx.ext.web.RoutingContext;
 
 public class PublicKeysListHandler implements Handler<RoutingContext> {
-  private final ArtifactSignerProvider artifactSignerProvider;
+  private final List<ArtifactSignerProvider> artifactSignerProviders;
 
-  public PublicKeysListHandler(final ArtifactSignerProvider artifactSignerProvider) {
-    this.artifactSignerProvider = artifactSignerProvider;
+  public PublicKeysListHandler(final List<ArtifactSignerProvider> artifactSignerProviders) {
+    this.artifactSignerProviders = artifactSignerProviders;
   }
 
   @Override
   public void handle(final RoutingContext context) {
     final List<String> availableIdentifiers =
-        new ArrayList<>(artifactSignerProvider.availableIdentifiers());
+        artifactSignerProviders.stream()
+            .flatMap(provider -> provider.availableIdentifiers().stream())
+            .collect(Collectors.toList());
+
     final String jsonEncodedKeys = new JsonArray(availableIdentifiers).encode();
     context.response().putHeader(CONTENT_TYPE, JSON_UTF_8).end(jsonEncodedKeys);
   }

core/src/test/java/tech/pegasys/web3signer/core/service/http/SwaggerUIRouteTest.java → core/src/test/java/tech/pegasys/web3signer/core/routes/SwaggerUIRouteTest.java

@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.web3signer.core.service.http;
+package tech.pegasys.web3signer.core.routes;
 
 import static org.assertj.core.api.Assertions.assertThat;