Merge pull request #2312 from devinbileck/regtest-host-parameter

Allow host as bitcoinRegtestHost parameter
bisq-network · Jan 24, 2019 · 92d15c2 · 92d15c2
2 parents 852a1df + 145e3ea
commit 92d15c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -482,9 +482,9 @@ protected void customizeOptionParsing(OptionParser parser) {
                 .describedAs(format("%s|%s|%s", BTC_MAINNET, BTC_TESTNET, BTC_REGTEST));
 
         parser.accepts(BtcOptionKeys.REG_TEST_HOST,
-                format("(default: %s)", RegTestHost.DEFAULT))
+                format("Bitcoin regtest host when using BTC_REGTEST network (default: %s)", RegTestHost.DEFAULT_HOST))
                 .withRequiredArg()
-                .ofType(RegTestHost.class);
+                .describedAs("host");
 
         parser.accepts(BtcOptionKeys.BTC_NODES,
                 "Custom nodes used for BitcoinJ as comma separated IP addresses.")

diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/bisq/core/btc/BitcoinModule.java
@@ -42,6 +42,8 @@
 
 import java.io.File;
 
+import java.util.Arrays;
+
 import static com.google.inject.name.Names.named;
 
 public class BitcoinModule extends AppModule {
@@ -51,7 +53,13 @@ public BitcoinModule(Environment environment) {
 
     @Override
     protected void configure() {
-        bind(RegTestHost.class).toInstance(environment.getProperty(BtcOptionKeys.REG_TEST_HOST, RegTestHost.class, RegTestHost.DEFAULT));
+        String regTestHost = environment.getProperty(BtcOptionKeys.REG_TEST_HOST, String.class, RegTestHost.DEFAULT_HOST);
+        if (Arrays.asList("localhost", "127.0.0.1").contains(regTestHost)) {
+            bind(RegTestHost.class).toInstance(RegTestHost.LOCALHOST);
+        } else {
+            bind(RegTestHost.class).toInstance(RegTestHost.REMOTE_HOST);
+        }
+        RegTestHost.HOST = regTestHost;
 
         bindConstant().annotatedWith(named(UserAgent.NAME_KEY)).to(environment.getRequiredProperty(UserAgent.NAME_KEY));
         bindConstant().annotatedWith(named(UserAgent.VERSION_KEY)).to(environment.getRequiredProperty(UserAgent.VERSION_KEY));

diff --git a/core/src/main/java/bisq/core/btc/setup/RegTestHost.java b/core/src/main/java/bisq/core/btc/setup/RegTestHost.java
@@ -21,9 +21,9 @@ public enum RegTestHost {
 
     NONE,
     LOCALHOST,
-    REG_TEST_SERVER; // 188.226.179.109
+    REMOTE_HOST;
 
-    public static final RegTestHost DEFAULT = LOCALHOST;
-    public static final String SERVER_IP = "188.226.179.109";
+    public static final String DEFAULT_HOST = "localhost";
+    public static String HOST = DEFAULT_HOST;
 
 }
diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
@@ -235,7 +235,7 @@ protected void onSetupCompleted() {
             walletConfig.setMinBroadcastConnections(1);
             if (regTestHost == RegTestHost.LOCALHOST) {
                 walletConfig.setPeerNodesForLocalHost();
-            } else if (regTestHost == RegTestHost.REG_TEST_SERVER) {
+            } else if (regTestHost == RegTestHost.REMOTE_HOST) {
                 walletConfig.setMinBroadcastConnections(1);
                 configPeerNodesForRegTestServer();
             } else {
@@ -315,7 +315,7 @@ private int evaluateMode(String socks5DiscoverModeString) {
 
     private void configPeerNodesForRegTestServer() {
         try {
-            walletConfig.setPeerNodes(new PeerAddress(InetAddress.getByName(RegTestHost.SERVER_IP), params.getPort()));
+            walletConfig.setPeerNodes(new PeerAddress(InetAddress.getByName(RegTestHost.HOST), params.getPort()));
         } catch (UnknownHostException e) {
             log.error(e.toString());
             e.printStackTrace();