mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make code more readable

Browse Source
This commit is contained in:
chimp1984 2021-01-01 14:17:12 -05:00
parent 3cf6c60354
commit 851a44ccb8
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java
View File

@ -23,6 +23,7 @@ import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.NewTor;
import bisq.network.p2p.network.RunningTor;
import bisq.network.p2p.network.TorMode;
import bisq.network.p2p.network.TorNetworkNode;
import bisq.common.config.Config;
@ -54,13 +55,32 @@ public class NetworkNodeProvider implements Provider<NetworkNode> {
@Nullable @Named(Config.TOR_CONTROL_COOKIE_FILE) File cookieFile,
@Named(Config.TOR_STREAM_ISOLATION) boolean streamIsolation,
@Named(Config.TOR_CONTROL_USE_SAFE_COOKIE_AUTH) boolean useSafeCookieAuthentication) {
networkNode = useLocalhostForP2P ?
new LocalhostNetworkNode(port, networkProtoResolver, networkFilter) :
new TorNetworkNode(port, networkProtoResolver, streamIsolation,
controlPort != Config.UNSPECIFIED_PORT ?
new RunningTor(torDir, controlPort, password, cookieFile, useSafeCookieAuthentication) :
new NewTor(torDir, torrcFile, torrcOptions, bridgeAddressProvider.getBridgeAddresses()),
networkFilter);
if (useLocalhostForP2P) {
networkNode = new LocalhostNetworkNode(port, networkProtoResolver, networkFilter);
} else {
TorMode torMode = getTorMode(bridgeAddressProvider,
torDir,
torrcFile,
torrcOptions,
controlPort,
password,
cookieFile,
useSafeCookieAuthentication);
networkNode = new TorNetworkNode(port, networkProtoResolver, streamIsolation, torMode, networkFilter);
}
}
private TorMode getTorMode(BridgeAddressProvider bridgeAddressProvider,
File torDir,
@Nullable File torrcFile,
String torrcOptions,
int controlPort,
String password,
@Nullable File cookieFile,
boolean useSafeCookieAuthentication) {
return controlPort != Config.UNSPECIFIED_PORT ?
new RunningTor(torDir, controlPort, password, cookieFile, useSafeCookieAuthentication) :
new NewTor(torDir, torrcFile, torrcOptions, bridgeAddressProvider.getBridgeAddresses());
}
@Override