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 pull request #3434 from lusarz/refactor-bisq-environment-5

Browse Source 
Refactor BisqEnvironment - change type of ignoreLocalBtcNode to boolean
This commit is contained in:
Florian Reimair 2019-11-04 13:37:25 +01:00 committed by GitHub
commit 415aa105fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/bisq/core/app/BisqEnvironment.java
View File

@ -195,7 +195,10 @@ public class BisqEnvironment extends StandardEnvironment {
banList, dumpStatistics, maxMemory, socks5ProxyBtcAddress, banList, dumpStatistics, maxMemory, socks5ProxyBtcAddress,
torRcFile, torRcOptions, externalTorControlPort, externalTorPassword, externalTorCookieFile, torRcFile, torRcOptions, externalTorControlPort, externalTorPassword, externalTorCookieFile,
socks5ProxyHttpAddress, useAllProvidedNodes, numConnectionForBtc, genesisTxId, genesisBlockHeight, genesisTotalSupply, socks5ProxyHttpAddress, useAllProvidedNodes, numConnectionForBtc, genesisTxId, genesisBlockHeight, genesisTotalSupply,
referralId, daoActivated, msgThrottlePerSec, msgThrottlePer10Sec, sendMsgThrottleTrigger, sendMsgThrottleSleep, ignoreLocalBtcNode; referralId, daoActivated, msgThrottlePerSec, msgThrottlePer10Sec, sendMsgThrottleTrigger, sendMsgThrottleSleep;
@Getter
protected boolean ignoreLocalBtcNode;
protected final boolean externalTorUseSafeCookieAuthentication, torStreamIsolation; protected final boolean externalTorUseSafeCookieAuthentication, torStreamIsolation;
@ -264,7 +267,7 @@ public class BisqEnvironment extends StandardEnvironment {
userAgent = getProperty(commandLineProperties, BtcOptionKeys.USER_AGENT, "Bisq"); userAgent = getProperty(commandLineProperties, BtcOptionKeys.USER_AGENT, "Bisq");
useAllProvidedNodes = getProperty(commandLineProperties, BtcOptionKeys.USE_ALL_PROVIDED_NODES, "false"); useAllProvidedNodes = getProperty(commandLineProperties, BtcOptionKeys.USE_ALL_PROVIDED_NODES, "false");
numConnectionForBtc = getProperty(commandLineProperties, BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, "9"); numConnectionForBtc = getProperty(commandLineProperties, BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, "9");
ignoreLocalBtcNode = getProperty(commandLineProperties, BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, "false"); ignoreLocalBtcNode = getProperty(commandLineProperties, BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, "false").equalsIgnoreCase("true");
MutablePropertySources propertySources = getPropertySources(); MutablePropertySources propertySources = getPropertySources();
@ -344,10 +347,6 @@ public class BisqEnvironment extends StandardEnvironment {
} }
} }
public boolean getIgnoreLocalBtcNode() {
return ignoreLocalBtcNode.equalsIgnoreCase("true");
}
private Resource getAppDirPropertiesResource() { private Resource getAppDirPropertiesResource() {
String location = String.format("file:%s/bisq.properties", appDataDir); String location = String.format("file:%s/bisq.properties", appDataDir);
return resourceLoader.getResource(location); return resourceLoader.getResource(location);
@ -429,7 +428,7 @@ public class BisqEnvironment extends StandardEnvironment {
setProperty(BtcOptionKeys.USER_AGENT, userAgent); setProperty(BtcOptionKeys.USER_AGENT, userAgent);
setProperty(BtcOptionKeys.USE_ALL_PROVIDED_NODES, useAllProvidedNodes); setProperty(BtcOptionKeys.USE_ALL_PROVIDED_NODES, useAllProvidedNodes);
setProperty(BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, numConnectionForBtc); setProperty(BtcOptionKeys.NUM_CONNECTIONS_FOR_BTC, numConnectionForBtc);
setProperty(BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, ignoreLocalBtcNode); setProperty(BtcOptionKeys.IGNORE_LOCAL_BTC_NODE, String.valueOf(ignoreLocalBtcNode));
setProperty(UserAgent.NAME_KEY, appName); setProperty(UserAgent.NAME_KEY, appName);
setProperty(UserAgent.VERSION_KEY, Version.VERSION); setProperty(UserAgent.VERSION_KEY, Version.VERSION);

2
core/src/main/java/bisq/core/app/BisqSetup.java
View File

@ -466,7 +466,7 @@ public class BisqSetup {
// For DAO testnet we ignore local btc node // For DAO testnet we ignore local btc node
if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() || if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() ||
BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet() || BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet() ||
bisqEnvironment.getIgnoreLocalBtcNode()) { bisqEnvironment.isIgnoreLocalBtcNode()) {
step3(); step3();
} else { } else {
new Thread(() -> { new Thread(() -> {