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

Rename baseCurrencyNetworkParameters to networkParameters

Browse source
This commit is contained in:
chimp1984 2020-10-01 09:46:11 -05:00
parent 8a3cacd867
commit 9fce06832d
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/bisq/common/config/Config.java
View file

@ -154,7 +154,7 @@ public class Config {
public final List<String> bannedPriceRelayNodes;
public final List<String> bannedSeedNodes;
public final BaseCurrencyNetwork baseCurrencyNetwork;
public final NetworkParameters baseCurrencyNetworkParameters;
public final NetworkParameters networkParameters;
public final boolean ignoreLocalBtcNode;
public final String bitcoinRegtestHost;
public final boolean daoActivated;
@ -702,7 +702,7 @@ public class Config {
this.bannedPriceRelayNodes = options.valuesOf(bannedPriceRelayNodesOpt);
this.bannedSeedNodes = options.valuesOf(bannedSeedNodesOpt);
this.baseCurrencyNetwork = (BaseCurrencyNetwork) options.valueOf(baseCurrencyNetworkOpt);
this.baseCurrencyNetworkParameters = baseCurrencyNetwork.getParameters();
this.networkParameters = baseCurrencyNetwork.getParameters();
this.ignoreLocalBtcNode = options.valueOf(ignoreLocalBtcNodeOpt);
this.bitcoinRegtestHost = options.valueOf(bitcoinRegtestHostOpt);
this.torrcFile = options.has(torrcFileOpt) ? options.valueOf(torrcFileOpt).toFile() : null;

2
core/src/main/java/bisq/core/app/CoreModule.java
View file

@ -65,7 +65,7 @@ public class CoreModule extends AppModule {
bind(File.class).annotatedWith(named(STORAGE_DIR)).toInstance(config.storageDir);
CoinFormatter btcFormatter = new ImmutableCoinFormatter(config.baseCurrencyNetworkParameters.getMonetaryFormat());
CoinFormatter btcFormatter = new ImmutableCoinFormatter(config.networkParameters.getMonetaryFormat());
bind(CoinFormatter.class).annotatedWith(named(FormattingUtils.BTC_FORMATTER_KEY)).toInstance(btcFormatter);
bind(File.class).annotatedWith(named(KEY_STORAGE_DIR)).toInstance(config.keyStorageDir);

4
core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java
View file

@ -6,9 +6,9 @@ import bisq.common.config.Config;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.net.Socket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.io.IOException;
@ -34,7 +34,7 @@ public class LocalBitcoinNode {
@Inject
public LocalBitcoinNode(Config config) {
this.config = config;
this.port = config.baseCurrencyNetworkParameters.getPort();
this.port = config.networkParameters.getPort();
}
/**