Tor: Remove Constants

bisq-network · Aug 20, 2023 · bb30246 · bb30246
1 parent 6426741
commit bb30246
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 62 deletions.
diff --git a/network/tor/tor/src/main/java/bisq/tor/Constants.java b/network/tor/tor/src/main/java/bisq/tor/Constants.java
diff --git a/network/tor/tor/src/main/java/bisq/tor/TorSocksProxyFactory.java b/network/tor/tor/src/main/java/bisq/tor/TorSocksProxyFactory.java
@@ -44,7 +44,7 @@ public Socket getSocket(@Nullable String streamId) throws IOException {
     }
 
     public Socks5Proxy getSocks5Proxy(@Nullable String streamId) throws IOException {
-        Socks5Proxy socks5Proxy = new Socks5Proxy(Constants.LOCALHOST, socksPort);
+        Socks5Proxy socks5Proxy = new Socks5Proxy("127.0.0.1", socksPort);
         socks5Proxy.resolveAddrLocally(false);
         if (streamId == null) {
             return socks5Proxy;

diff --git a/network/tor/tor/src/main/java/bisq/tor/installer/TorInstallationFiles.java b/network/tor/tor/src/main/java/bisq/tor/installer/TorInstallationFiles.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.installer;
 
-import bisq.tor.Constants;
 import lombok.Getter;
 
 import java.io.File;
@@ -33,7 +32,7 @@ public class TorInstallationFiles {
     public TorInstallationFiles(Path torDirPath) {
         torDir = torDirPath.toFile();
         torBinary = new File(torDir, "tor");
-        torrcFile = new File(torDir, Constants.TORRC);
-        versionFile = new File(torDir, Constants.VERSION);
+        torrcFile = new File(torDir, "torrc");
+        versionFile = new File(torDir, "version");
     }
 }
diff --git a/network/tor/tor/src/main/java/bisq/tor/onionservice/OnionServicePublishService.java b/network/tor/tor/src/main/java/bisq/tor/onionservice/OnionServicePublishService.java
@@ -17,7 +17,6 @@
 
 package bisq.tor.onionservice;
 
-import bisq.tor.Constants;
 import bisq.tor.OnionAddress;
 import bisq.tor.controller.NativeTorController;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +29,8 @@
 
 @Slf4j
 public class OnionServicePublishService {
+    private static final String HS_DIR_NANE = "hiddenservice";
+
     private final NativeTorController nativeTorController;
     private final Path torDirPath;
     private Optional<OnionServiceDataDirManager> onionDataDirManager = Optional.empty();
@@ -55,7 +56,7 @@ public synchronized CompletableFuture<OnionAddress> initialize(String nodeId, in
 
             onionDataDirManager = Optional.of(
                     new OnionServiceDataDirManager(
-                            torDirPath.resolve(Constants.HS_DIR).resolve(nodeId)
+                            torDirPath.resolve(HS_DIR_NANE).resolve(nodeId)
                     )
             );
             onionDataDirManager.ifPresent(dataDirManager -> dataDirManager.persist(result));