BitcoindRegtestProcess: Expose P2P port number

BitcoinJ connects to Bitcoin Core's P2P port. Up to now, we selected a random port without saving the p2p port number.
bisq-network · Oct 9, 2024 · 523ee17 · 523ee17
1 parent c3dd750
commit 523ee17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.../bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java b/.../bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
@@ -38,13 +38,15 @@
 public class BitcoindRegtestProcess extends DaemonProcess {
 
     private final Path binaryPath;
+    protected final int p2pPort;
     @Getter
     protected final RpcConfig rpcConfig;
     private final BitcoindDaemon bitcoindDaemon;
 
-    public BitcoindRegtestProcess(Path binaryPath, RpcConfig rpcConfig, Path dataDir) {
+    public BitcoindRegtestProcess(Path binaryPath, int p2pPort, RpcConfig rpcConfig, Path dataDir) {
         super(dataDir);
         this.binaryPath = binaryPath;
+        this.p2pPort = p2pPort;
         this.rpcConfig = rpcConfig;
         JsonRpcClient rpcClient = RpcClientFactory.createDaemonRpcClient(rpcConfig);
         bitcoindDaemon = new BitcoindDaemon(rpcClient);
@@ -60,7 +62,7 @@ public ProcessConfig createProcessConfig() {
                         "-datadir=" + dataDir.toAbsolutePath(),
                         "-debug=1",
 
-                        "-bind=127.0.0.1:" + BitcoindRegtestSetup.findFreeSystemPort(),
+                        "-bind=127.0.0.1:" + p2pPort,
                         "-whitelist=127.0.0.1",
 
                         "-rpcbind=127.0.0.1:" + rpcConfig.getPort(),

diff --git a/...ts/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java b/...ts/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
@@ -41,6 +41,8 @@
 public class BitcoindRegtestSetup
         extends AbstractRegtestSetup<MultiProcessCoordinator> {
 
+    @Getter
+    private final int p2pPort;
     @Getter
     private final RpcConfig rpcConfig;
     private final BitcoindRegtestProcess bitcoindProcess;
@@ -49,6 +51,7 @@ public class BitcoindRegtestSetup
 
     public BitcoindRegtestSetup() throws IOException {
         super();
+        p2pPort = BitcoindRegtestSetup.findFreeSystemPort();
         rpcConfig = createRpcConfig();
         bitcoindProcess = createBitcoindProcess();
         remoteBitcoind = new RemoteBitcoind(rpcConfig);
@@ -113,6 +116,7 @@ private BitcoindRegtestProcess createBitcoindProcess() throws IOException {
         Path bitcoindDataDir = tmpDirPath.resolve("bitcoind_data_dir");
         return new BitcoindRegtestProcess(
                 bitcoindPath,
+                p2pPort,
                 rpcConfig,
                 bitcoindDataDir
         );

diff --git a/...ntsd/src/integrationTest/java/bisq/wallets/elementsd/regtest/ElementsdRegtestProcess.java b/...ntsd/src/integrationTest/java/bisq/wallets/elementsd/regtest/ElementsdRegtestProcess.java
@@ -37,7 +37,7 @@ public class ElementsdRegtestProcess extends BitcoindRegtestProcess {
     private final ElementsdConfig elementsdConfig;
 
     public ElementsdRegtestProcess(ElementsdConfig elementsdConfig, Path dataDir) {
-        super(null, elementsdConfig.elementsdRpcConfig(), dataDir);
+        super(null, NetworkUtils.findFreeSystemPort(), elementsdConfig.elementsdRpcConfig(), dataDir);
         this.elementsdConfig = elementsdConfig;
     }
 
@@ -52,7 +52,7 @@ public ProcessConfig createProcessConfig() {
                         "-datadir=" + dataDir.toAbsolutePath(),
                         "-debug=1",
 
-                        "-bind=127.0.0.1:" + NetworkUtils.findFreeSystemPort(),
+                        "-bind=127.0.0.1:" + p2pPort,
                         "-whitelist=127.0.0.1",
 
                         "-rpcbind=127.0.0.1:" + rpcConfig.getPort(),