diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java index 2659853f2c..08445a746e 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/bisq/common/config/Config.java @@ -154,7 +154,7 @@ public class Config { public final List bannedPriceRelayNodes; public final List 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; diff --git a/core/src/main/java/bisq/core/app/CoreModule.java b/core/src/main/java/bisq/core/app/CoreModule.java index e207ae033b..8f30070532 100644 --- a/core/src/main/java/bisq/core/app/CoreModule.java +++ b/core/src/main/java/bisq/core/app/CoreModule.java @@ -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); diff --git a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java b/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java index 7c4e955dd4..358de89a12 100644 --- a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java +++ b/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java @@ -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(); } /**