From 72ff4dca2b241a55be17a1c9c15946abb20818ca Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 15 Aug 2020 12:20:25 -0300
Subject: [PATCH] Use non-default regtest bitcoind -rpcport

The default bitcoind / bitcoin-cli rpcport option has been changed
from 18443 to 19443, to help avoid rpcport conflicts between apitest's
bitcoind instances and other bitcoind and/or bitcion-qt instances
which are probably using the bitcoin-core default (regtest) rpcport
18443.

However, this commit cannot include other changes for avoiding bind
address:port conflicts between apitest bitcoind instances and other
regtest bitcoin-core instances because bitcoinj's bind port is hardcoded
in RegTestParams.java as 18444.

In order to avoid bitcoin-core regtest mode bind address conflicts,
you must start or restart your bitcoind or bitcoin-qt instance with a
non-default bind port argument, e.g.

	bitcoin-qt -regtest -port=20444
---
 apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java | 4 ++--
 apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java     | 1 +
 apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java b/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
index 22ae67fcce..027d046b26 100644
--- a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
+++ b/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
@@ -173,9 +173,9 @@ public class ApiTestConfig {
                         .ofType(String.class).defaultsTo("localhost");
 
         ArgumentAcceptingOptionSpec<Integer> bitcoinRpcPortOpt =
-                parser.accepts(BITCOIN_RPC_PORT, "Bitcoin Core rpc port")
+                parser.accepts(BITCOIN_RPC_PORT, "Bitcoin Core rpc port (non-default)")
                         .withRequiredArg()
-                        .ofType(Integer.class).defaultsTo(18443);
+                        .ofType(Integer.class).defaultsTo(19443);
 
         ArgumentAcceptingOptionSpec<String> bitcoinRpcUserOpt =
                 parser.accepts(BITCOIN_RPC_USER, "Bitcoin rpc user")
diff --git a/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java b/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java
index 0bf49aa360..2367443b0c 100644
--- a/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java
+++ b/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java
@@ -149,6 +149,7 @@ public class BitcoinCli extends AbstractLinuxProcess implements LinuxProcess {
         verifyBitcoinPathsExist(false);
         verifyBitcoindRunning();
         commandWithOptions = config.bitcoinPath + "/bitcoin-cli -regtest "
+                + " -rpcport=" + config.bitcoinRpcPort
                 + " -rpcuser=" + config.bitcoinRpcUser
                 + " -rpcpassword=" + config.bitcoinRpcPassword
                 + " " + command;
diff --git a/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java b/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java
index 24d694a22d..e61f131743 100644
--- a/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java
+++ b/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java
@@ -56,6 +56,7 @@ public class BitcoinDaemon extends AbstractLinuxProcess implements LinuxProcess
                 + " -peerbloomfilters=1"
                 + " -debug=net"
                 + " -fallbackfee=0.0002"
+                + " -rpcport=" + config.bitcoinRpcPort
                 + " -rpcuser=" + config.bitcoinRpcUser
                 + " -rpcpassword=" + config.bitcoinRpcPassword
                 + " -blocknotify=" + config.bitcoinDatadir + "/blocknotify";