Merge pull request #31 from ghubstan/remove-program-args-param-from-ctor

Remove String[] args from network service class constructors
bisq-network · Jan 4, 2022 · 92cb549 · 92cb549
2 parents 22bf312 + d18a3d4
commit 92cb549
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/application/src/main/java/network/misq/application/DefaultServiceProvider.java b/application/src/main/java/network/misq/application/DefaultServiceProvider.java
@@ -75,7 +75,7 @@ public DefaultServiceProvider(ApplicationOptions applicationOptions, String[] ar
         keyPairService = new KeyPairService(keyPairRepositoryConf);
 
         NetworkService.Config networkServiceConfig = NetworkServiceConfigFactory.getConfig(applicationOptions.baseDir(),
-                getConfig("misq.networkServiceConfig"), args);
+                getConfig("misq.networkServiceConfig"));
         networkService = new NetworkService(networkServiceConfig, keyPairService);
 
         identityService = new IdentityService(networkService);

diff --git a/application/src/main/java/network/misq/application/NetworkNodeServiceProvider.java b/application/src/main/java/network/misq/application/NetworkNodeServiceProvider.java
@@ -47,15 +47,15 @@ public class NetworkNodeServiceProvider extends ServiceProvider {
     private final NetworkService networkService;
     private final ApplicationOptions applicationOptions;
 
-    public NetworkNodeServiceProvider(ApplicationOptions applicationOptions, String[] args) {
+    public NetworkNodeServiceProvider(ApplicationOptions applicationOptions) {
         super("Seed");
         this.applicationOptions = applicationOptions;
 
         KeyPairService.Conf keyPairRepositoryConf = KeyPairRepositoryConfigFactory.getConfig(applicationOptions.baseDir());
         keyPairService = new KeyPairService(keyPairRepositoryConf);
 
         NetworkService.Config networkServiceConfig = NetworkServiceConfigFactory.getConfig(applicationOptions.baseDir(),
-                getConfig("misq.networkServiceConfig"), args);
+                getConfig("misq.networkServiceConfig"));
         networkService = new NetworkService(networkServiceConfig, keyPairService);
     }
 

diff --git a/network/src/main/java/network/misq/network/NetworkServiceConfigFactory.java b/network/src/main/java/network/misq/network/NetworkServiceConfigFactory.java
@@ -36,15 +36,8 @@
  */
 @Slf4j
 public class NetworkServiceConfigFactory {
-    public static NetworkService.Config getConfig(String baseDir, Config typesafeConfig) {
-        return getConfig(baseDir, typesafeConfig, Optional.empty());
-    }
 
-    public static NetworkService.Config getConfig(String baseDir, Config typesafeConfig, String[] args) {
-        return getConfig(baseDir, typesafeConfig, Optional.of(args));
-    }
-
-    private static NetworkService.Config getConfig(String baseDir, Config typesafeConfig, Optional<String[]> args) {
+    public static NetworkService.Config getConfig(String baseDir, Config typesafeConfig) {
         //  Set<Transport.Type> supportedTransportTypes = Set.of(Transport.Type.CLEAR, Transport.Type.TOR, Transport.Type.I2P);
         Set<Transport.Type> supportedTransportTypes = Set.of(Transport.Type.CLEAR, Transport.Type.TOR);
         // Set<Transport.Type> supportedTransportTypes = Set.of(Transport.Type.CLEAR);