mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor handling of empty list from custom nodes to avoid code duplication

Browse source
This commit is contained in:
Manfred Karrer 2018-01-30 12:02:17 -05:00
parent acab31955e
commit 83f7cfbd8b
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
View file

@ -301,22 +301,25 @@ public class WalletsSetup {
private void configPeerNodes(Socks5Proxy socks5Proxy) { private void configPeerNodes(Socks5Proxy socks5Proxy) {
boolean useCustomNodes = false; boolean useCustomNodes = false;
List<BitcoinNodes.BtcNode> btcNodeList = new ArrayList<>(); List<BitcoinNodes.BtcNode> btcNodeList = new ArrayList<>();
// We prefer to duplicate the check for CUSTOM here as in case the custom nodes lead to an empty list we fall back to the PROVIDED mode.
if (preferences.getBitcoinNodesOptionOrdinal() == BitcoinNodes.BitcoinNodesOption.CUSTOM.ordinal()) {
btcNodeList = BitcoinNodes.toBtcNodesList(Utilities.commaSeparatedListToSet(preferences.getBitcoinNodes(), false));
if (btcNodeList.isEmpty()) {
log.warn("Custom nodes is set but no valid nodes are provided. We fall back to provided nodes option.");
preferences.setBitcoinNodesOptionOrdinal(BitcoinNodes.BitcoinNodesOption.PROVIDED.ordinal());
}
}
switch (BitcoinNodes.BitcoinNodesOption.values()[preferences.getBitcoinNodesOptionOrdinal()]) { switch (BitcoinNodes.BitcoinNodesOption.values()[preferences.getBitcoinNodesOptionOrdinal()]) {
case CUSTOM: case CUSTOM:
btcNodeList = BitcoinNodes.toBtcNodesList(Utilities.commaSeparatedListToSet(preferences.getBitcoinNodes(), false)); // We have set the btcNodeList already above
if (!btcNodeList.isEmpty()) { walletConfig.setMinBroadcastConnections((int) Math.ceil(btcNodeList.size() * 0.5));
walletConfig.setMinBroadcastConnections((int) Math.ceil(btcNodeList.size() * 0.5)); // If Tor is set we usually only use onion nodes, but if user provides mixed clear net and onion nodes we want to use both
// If Tor is set we usually only use onion nodes, but if user provides mixed clear net and onion nodes we want to use both useCustomNodes = true;
useCustomNodes = true;
} else {
log.warn("Custom nodes is set but no valid nodes are provided. We fall back to provided nodes option.");
preferences.setBitcoinNodesOptionOrdinal(BitcoinNodes.BitcoinNodesOption.PROVIDED.ordinal());
btcNodeList = bitcoinNodes.getProvidedBtcNodes();
walletConfig.setMinBroadcastConnections(4);
}
break; break;
case PUBLIC: case PUBLIC:
// we keep the empty list // We keep the empty btcNodeList
walletConfig.setMinBroadcastConnections((int) Math.floor(DEFAULT_CONNECTIONS * 0.8)); walletConfig.setMinBroadcastConnections((int) Math.floor(DEFAULT_CONNECTIONS * 0.8));
break; break;
default: default: