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

Remove minBroadcastConnections as class field in WalletsSetup. Use walletConfig.setMinBroadcastConnections for regtest mode.

Browse source
This commit is contained in:
Manfred Karrer 2018-01-19 20:36:19 -05:00
parent 410959d389
commit c6691c91a1
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,6 @@ public class WalletsSetup {
private final List<Runnable> setupCompletedHandlers = new ArrayList<>();
public final BooleanProperty shutDownComplete = new SimpleBooleanProperty();
private WalletConfig walletConfig;
private int minBroadcastConnections;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
@ -274,7 +273,7 @@ public class WalletsSetup {
private void configPeerNodes(Socks5Proxy socks5Proxy) {
if (params == RegTestParams.get()) {
minBroadcastConnections = 1;
walletConfig.setMinBroadcastConnections(1);
if (regTestHost == RegTestHost.REG_TEST_SERVER) {
try {
walletConfig.setPeerNodes(new PeerAddress(InetAddress.getByName(RegTestHost.SERVER_IP), params.getPort()));
@ -288,7 +287,7 @@ public class WalletsSetup {
}
} else {
List<BitcoinNodes.BtcNode> btcNodeList = new ArrayList<>();
minBroadcastConnections = (int) Math.floor(DEFAULT_CONNECTIONS * 0.8);
walletConfig.setMinBroadcastConnections((int) Math.floor(DEFAULT_CONNECTIONS * 0.8));
switch (BitcoinNodes.BitcoinNodesOption.values()[preferences.getBitcoinNodesOptionOrdinal()]) {
case CUSTOM:
String bitcoinNodesString = preferences.getBitcoinNodes();
@ -310,8 +309,7 @@ public class WalletsSetup {
// We require only 4 nodes instead of 7 (for 9 max connections) because our provided nodes
// are more reliable than random public nodes.
minBroadcastConnections = 4;
walletConfig.setMinBroadcastConnections(minBroadcastConnections);
walletConfig.setMinBroadcastConnections(4);
break;
}
@ -516,7 +514,7 @@ public class WalletsSetup {
}
public boolean hasSufficientPeersForBroadcast() {
return bisqEnvironment.isBitcoinLocalhostNodeRunning() ? true : numPeers.get() >= minBroadcastConnections;
return bisqEnvironment.isBitcoinLocalhostNodeRunning() ? true : numPeers.get() >= walletConfig.getMinBroadcastConnections();
}