Merge pull request #1117 from alvasw/make_typesafe_tor_overrides_came…

…lcase Typesafe config rename torrc_overrides to torrcOverrides
bisq-network · Aug 10, 2023 · 4a32921 · 4a32921
2 parents c61f963 + 4ff2a80
commit 4a32921
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/desktop_app/src/main/resources/desktop.conf b/desktop_app/src/main/resources/desktop.conf
@@ -105,7 +105,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
-                torrc_overrides = {}
+                torrcOverrides = {}
                 socketTimeout = 120
             }
             i2p { 

diff --git a/network/network/src/main/java/bisq/network/p2p/node/transport/TorTransport.java b/network/network/src/main/java/bisq/network/p2p/node/transport/TorTransport.java
@@ -3,8 +3,8 @@
 import bisq.network.NetworkService;
 import bisq.network.p2p.node.Address;
 import bisq.network.p2p.node.ConnectionException;
-import bisq.tor.onionservice.CreateOnionServiceResponse;
 import bisq.tor.TorService;
+import bisq.tor.onionservice.CreateOnionServiceResponse;
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -39,7 +39,7 @@ public static Config from(String baseDir, com.typesafe.config.Config config) {
             return new Config(
                     baseDir,
                     (int) TimeUnit.SECONDS.toMillis(config.getInt("socketTimeout")),
-                    parseTorrcOverrideConfig(config.getConfig("torrc_overrides"))
+                    parseTorrcOverrideConfig(config.getConfig("torrcOverrides"))
             );
         }
 

diff --git a/oracle_node_app/src/main/resources/oracle_node.conf b/oracle_node_app/src/main/resources/oracle_node.conf
@@ -109,7 +109,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
-                torrc_overrides = {}
+                torrcOverrides = {}
                 socketTimeout = 120
             }
             i2p { 

diff --git a/rest_api_app/src/main/resources/rest_api.conf b/rest_api_app/src/main/resources/rest_api.conf
@@ -103,7 +103,7 @@ application {
                 socketTimeout = 120
             }
             tor {
-                torrc_overrides = {}
+                torrcOverrides = {}
                 socketTimeout = 120
             }
             i2p { 

diff --git a/seed_node_app/src/main/resources/seed_node.conf b/seed_node_app/src/main/resources/seed_node.conf
@@ -89,7 +89,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
-                torrc_overrides = {}
+                torrcOverrides = {}
                 socketTimeout = 120
             }
             i2p {