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

Merge branch 'feature/allow-btcNodes-in-regtest' of https://github.com/blabno/exchange into blabno-feature/allow-btcNodes-in-regtest

Browse Source
This commit is contained in:
Manfred Karrer 2018-03-02 22:38:41 -05:00
commit db8a5686b1
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
View File

@ -196,7 +196,7 @@ public class WalletsSetup {
};
if (params == RegTestParams.get()) {
configPeerNodesForRegTest();
configPeerNodesForRegTest(socks5Proxy);
} else if (bisqEnvironment.isBitcoinLocalhostNodeRunning()) {
configPeerNodesForLocalHostBitcoinNode();
} else {
@ -268,7 +268,7 @@ public class WalletsSetup {
return mode;
}
private void configPeerNodesForRegTest() {
private void configPeerNodesForRegTest(@Nullable Socks5Proxy proxy) {
walletConfig.setMinBroadcastConnections(1);
if (regTestHost == RegTestHost.REG_TEST_SERVER) {
try {
@ -280,6 +280,8 @@ public class WalletsSetup {
}
} else if (regTestHost == RegTestHost.LOCALHOST) {
walletConfig.setPeerNodesForLocalHost();
} else {
configPeerNodes(proxy);
}
}