Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typesafe config rename torrc_overrides to torrcOverrides #1117

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop_app/src/main/resources/desktop.conf
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ application {
socketTimeout = 120
}
tor {
torrc_overrides = {}
torrcOverrides = {}
socketTimeout = 120
}
i2p {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"))
);
}

Expand Down
2 changes: 1 addition & 1 deletion oracle_node_app/src/main/resources/oracle_node.conf
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ application {
socketTimeout = 120
}
tor {
torrc_overrides = {}
torrcOverrides = {}
socketTimeout = 120
}
i2p {
Expand Down
2 changes: 1 addition & 1 deletion rest_api_app/src/main/resources/rest_api.conf
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ application {
socketTimeout = 120
}
tor {
torrc_overrides = {}
torrcOverrides = {}
socketTimeout = 120
}
i2p {
Expand Down
2 changes: 1 addition & 1 deletion seed_node_app/src/main/resources/seed_node.conf
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ application {
socketTimeout = 120
}
tor {
torrc_overrides = {}
torrcOverrides = {}
socketTimeout = 120
}
i2p {
Expand Down