minor refactoring of variable name

Consensys · Oct 17, 2024 · af3ee4e · af3ee4e
1 parent ad8cadd
commit af3ee4e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/core/src/main/java/tech/pegasys/web3signer/core/Context.java b/core/src/main/java/tech/pegasys/web3signer/core/Context.java
@@ -26,19 +26,19 @@ public class Context {
   private final MetricsSystem metricsSystem;
   private final LogErrorHandler errorHandler;
   private final Vertx vertx;
-  private final List<ArtifactSignerProvider> artifactSignerProvider;
+  private final List<ArtifactSignerProvider> artifactSignerProviders;
 
   public Context(
       final Router router,
       final MetricsSystem metricsSystem,
       final LogErrorHandler errorHandler,
       final Vertx vertx,
-      final List<ArtifactSignerProvider> artifactSignerProvider) {
+      final List<ArtifactSignerProvider> artifactSignerProviders) {
     this.router = router;
     this.metricsSystem = metricsSystem;
     this.errorHandler = errorHandler;
     this.vertx = vertx;
-    this.artifactSignerProvider = artifactSignerProvider;
+    this.artifactSignerProviders = artifactSignerProviders;
   }
 
   public Router getRouter() {
@@ -57,7 +57,7 @@ public Vertx getVertx() {
     return vertx;
   }
 
-  public List<ArtifactSignerProvider> getArtifactSignerProvider() {
-    return artifactSignerProvider;
+  public List<ArtifactSignerProvider> getArtifactSignerProviders() {
+    return artifactSignerProviders;
   }
 }
diff --git a/core/src/main/java/tech/pegasys/web3signer/core/Runner.java b/core/src/main/java/tech/pegasys/web3signer/core/Runner.java
@@ -111,7 +111,7 @@ public void run() {
     final LogErrorHandler errorHandler = new LogErrorHandler();
     healthCheckHandler = HealthCheckHandler.create(vertx);
 
-    final List<ArtifactSignerProvider> artifactSignerProvider =
+    final List<ArtifactSignerProvider> artifactSignerProviders =
         Optional.ofNullable(createArtifactSignerProvider(vertx, metricsSystem)).orElse(List.of());
 
     try {
@@ -120,7 +120,7 @@ public void run() {
       metricsService.ifPresent(MetricsService::start);
 
       // load the artifact signer providers in order ...
-      artifactSignerProvider.forEach(
+      artifactSignerProviders.forEach(
           provider -> {
             try {
               provider.load().get(); // wait for signers to get loaded ...
@@ -163,7 +163,7 @@ public void run() {
       registerHealthCheckProcedure(DEFAULT_CHECK, promise -> promise.complete(Status.OK()));
 
       final Context context =
-          new Context(router, metricsSystem, errorHandler, vertx, artifactSignerProvider);
+          new Context(router, metricsSystem, errorHandler, vertx, artifactSignerProviders);
 
       populateRouter(context);
       if (baseConfig.isSwaggerUIEnabled()) {
@@ -183,7 +183,7 @@ public void run() {
 
       closeables.add(() -> shutdownVertx(vertx));
     } catch (final Throwable e) {
-      artifactSignerProvider.forEach(ArtifactSignerProvider::close);
+      artifactSignerProviders.forEach(ArtifactSignerProvider::close);
       shutdownVertx(vertx);
       metricsService.ifPresent(MetricsService::stop);
       LOG.error("Failed to initialise application", e);

diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/PublicKeysListRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/PublicKeysListRoute.java
@@ -45,7 +45,7 @@ public void register() {
         .produces(JSON_HEADER)
         .handler(
             new BlockingHandlerDecorator(
-                new PublicKeysListHandler(context.getArtifactSignerProvider()), false))
+                new PublicKeysListHandler(context.getArtifactSignerProviders()), false))
         .failureHandler(context.getErrorHandler());
   }
 }
diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/ReloadRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/ReloadRoute.java
@@ -31,7 +31,7 @@ public void register() {
         .getRouter()
         .route(HttpMethod.POST, RELOAD_PATH)
         .produces(JSON_HEADER)
-        .handler(new ReloadHandler(context.getArtifactSignerProvider()))
+        .handler(new ReloadHandler(context.getArtifactSignerProviders()))
         .failureHandler(context.getErrorHandler());
   }
 }
diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/eth1/Eth1SignRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/eth1/Eth1SignRoute.java
@@ -40,7 +40,7 @@ public Eth1SignRoute(final Context context) {
 
     // we need signerProvider which is an instance of DefaultArtifactSignerProvider
     final Optional<ArtifactSignerProvider> first =
-        context.getArtifactSignerProvider().stream()
+        context.getArtifactSignerProviders().stream()
             .filter(provider -> provider instanceof DefaultArtifactSignerProvider)
             .findFirst();
 

diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/eth1/JsonRpcRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/eth1/JsonRpcRoute.java
@@ -64,7 +64,7 @@ public JsonRpcRoute(final Context context, final Eth1Config eth1Config) {
 
     // we need signerProvider which is an instance of SecpArtifactSignerProviderAdapter
     final Optional<ArtifactSignerProvider> first =
-        context.getArtifactSignerProvider().stream()
+        context.getArtifactSignerProviders().stream()
             .filter(provider -> provider instanceof SecpArtifactSignerProviderAdapter)
             .findFirst();
     final ArtifactSignerProvider signerProvider;

diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/Eth2SignExtensionRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/Eth2SignExtensionRoute.java
@@ -36,7 +36,7 @@ public Eth2SignExtensionRoute(final Context context) {
     // there should be only one ArtifactSignerProvider in eth2 mode at the moment which is of BLS
     // types.
     final ArtifactSignerProvider artifactSignerProvider =
-        context.getArtifactSignerProvider().stream().findFirst().orElseThrow();
+        context.getArtifactSignerProviders().stream().findFirst().orElseThrow();
 
     blsSigner =
         new SignerForIdentifier<>(

diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/Eth2SignRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/Eth2SignRoute.java
@@ -52,7 +52,7 @@ public Eth2SignRoute(
     // there should be only one ArtifactSignerProvider in eth2 mode at the moment which is of BLS
     // types.
     final ArtifactSignerProvider artifactSignerProvider =
-        context.getArtifactSignerProvider().stream().findFirst().orElseThrow();
+        context.getArtifactSignerProviders().stream().findFirst().orElseThrow();
 
     blsSigner =
         new SignerForIdentifier<>(
@@ -64,7 +64,7 @@ public void register() {
     // there should be only one ArtifactSignerProvider in eth2 mode at the moment which is of BLS
     // types.
     final ArtifactSignerProvider artifactSignerProvider =
-        context.getArtifactSignerProvider().stream().findFirst().orElseThrow();
+        context.getArtifactSignerProviders().stream().findFirst().orElseThrow();
 
     context
         .getRouter()

diff --git a/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/KeyManagerApiRoute.java b/core/src/main/java/tech/pegasys/web3signer/core/routes/eth2/KeyManagerApiRoute.java
@@ -56,7 +56,7 @@ public KeyManagerApiRoute(
         slashingProtectionContext.map(SlashingProtectionContext::getSlashingProtection);
     // there should be only one ArtifactSignerProvider in eth2 mode at the moment which is of BLS
     // types.
-    blsSignerProvider = context.getArtifactSignerProvider().stream().findFirst().orElseThrow();
+    blsSignerProvider = context.getArtifactSignerProviders().stream().findFirst().orElseThrow();
   }
 
   @Override