bisq-network · HenrikJannsen · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024
diff --git a/...integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java b/...integrationTest/java/bisq/wallets/bitcoind/BitcoindConnectionFailureIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.regtest.ConnectionFailureIntegrationTests;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;
 import bisq.wallets.regtest.process.MultiProcessCoordinator;

diff --git a/...est/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java b/...est/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameDocumentationIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.calls.BitcoindCreateWalletRpcCall;
 import bisq.wallets.json_rpc.RpcConfig;

diff --git a/.../integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java b/.../integrationTest/java/bisq/wallets/bitcoind/BitcoindCreateWalletNameIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.regtest.AbstractRegtestSetup;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/...rc/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java b/...rc/integrationTest/java/bisq/wallets/bitcoind/BitcoindListDescriptorsIntegrationTest.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindDescriptor;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindListDescriptorResponse;

diff --git a/.../src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java b/.../src/integrationTest/java/bisq/wallets/bitcoind/BitcoindPsbtMultiSigIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.calls.requests.BitcoindImportDescriptorRequestEntry;

diff --git a/...d/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java b/...d/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindReceiveAddrIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.core.model.AddressType;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/...rc/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java b/...rc/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListTxsIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindListTransactionsResponse;
 import bisq.wallets.core.model.AddressType;

diff --git a/...ntegrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java b/...ntegrationTest/java/bisq/wallets/bitcoind/BitcoindSendAndListUnspentIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindListUnspentResponse;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/...bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java b/...bitcoind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSendIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.core.model.AddressType;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/...coind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java b/...coind/src/integrationTest/java/bisq/wallets/bitcoind/BitcoindSigningIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.core.model.AddressType;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/...grationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java b/...grationTest/java/bisq/wallets/bitcoind/BitcoindWalletCreationAndListIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.json_rpc.RpcConfig;

diff --git a/...st/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java b/...st/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqBlockHashIntegrationIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind.zmq;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;

diff --git a/...st/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java b/...st/java/bisq/wallets/bitcoind/zmq/BitcoindZeroMqConnectionInfoFinderIntegrationTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.bitcoind.zmq;
 
-import bisq.wallets.bitcoind.regtest.BitcoindExtension;
+import bisq.wallets.regtest.BitcoindExtension;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindGetZmqNotificationsResponse;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;

diff --git a/wallets/electrum/build.gradle.kts b/wallets/electrum/build.gradle.kts
@@ -23,7 +23,8 @@ dependencies {
     implementation("bisq:persistence")
     implementation(project(":json-rpc"))
     implementation(project(":process"))
-
+    implementation(project(":regtest"))
+
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)
 

diff --git a/...trum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrum/ElectrumRegtest.java b/...trum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrum/ElectrumRegtest.java
@@ -24,7 +24,7 @@
 import bisq.wallets.electrum.rpc.ElectrumDaemon;
 import bisq.wallets.electrum.rpc.ElectrumProcessConfig;
 import bisq.wallets.electrum.rpc.responses.ElectrumCreateResponse;
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import bisq.wallets.regtest.AbstractRegtestSetup;
 import bisq.wallets.regtest.bitcoind.RemoteBitcoind;
 import lombok.Getter;

diff --git a/...ationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java b/...ationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java
@@ -20,8 +20,8 @@
 import bisq.common.file.InputStreamScanner;
 import bisq.common.file.LogScanner;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.DaemonProcess;
-import bisq.wallets.process.ProcessConfig;
+import bisq.wallets.regtest.process.DaemonProcess;
+import bisq.wallets.regtest.process.ProcessConfig;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Collections;

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumProcess.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumProcess.java
@@ -21,7 +21,7 @@
 import bisq.common.platform.PlatformUtils;
 import bisq.wallets.electrum.rpc.ElectrumDaemon;
 import bisq.wallets.electrum.rpc.ElectrumProcessConfig;
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumRegtestProcess.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumRegtestProcess.java
@@ -26,8 +26,8 @@
 import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.DaemonProcess;
-import bisq.wallets.process.ProcessConfig;
+import bisq.wallets.regtest.process.DaemonProcess;
+import bisq.wallets.regtest.process.ProcessConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ntsd/src/integrationTest/java/bisq/wallets/elementsd/regtest/ElementsdRegtestProcess.java b/...ntsd/src/integrationTest/java/bisq/wallets/elementsd/regtest/ElementsdRegtestProcess.java
@@ -24,7 +24,7 @@
 import bisq.wallets.elementsd.ElementsdConfig;
 import bisq.wallets.elementsd.rpc.ElementsdDaemon;
 import bisq.wallets.json_rpc.JsonRpcClient;
-import bisq.wallets.process.ProcessConfig;
+import bisq.wallets.regtest.process.ProcessConfig;
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestProcess;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/wallets/regtest/build.gradle.kts b/wallets/regtest/build.gradle.kts
@@ -19,9 +19,6 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":bitcoind"))
     implementation(project(":json-rpc"))
-    implementation(project(":process"))
-
-    api(project(":process"))
 
     implementation(libs.assertj.core)
     implementation(libs.junit.jupiter)

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java
@@ -19,7 +19,7 @@
 
 import bisq.common.file.FileUtils;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/AbstractSharedRegtestInstanceTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.regtest;
 
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;

diff --git a/...s/bitcoind/regtest/BitcoindExtension.java → ...sq/wallets/regtest/BitcoindExtension.java b/...s/bitcoind/regtest/BitcoindExtension.java → ...sq/wallets/regtest/BitcoindExtension.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.bitcoind.regtest;
+package bisq.wallets.regtest;
 
 import bisq.wallets.regtest.bitcoind.BitcoindRegtestSetup;
 import org.junit.jupiter.api.extension.BeforeAllCallback;

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/ConnectionFailureIntegrationTests.java
@@ -22,7 +22,7 @@
 import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.exceptions.InvalidRpcCredentialsException;
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/Os.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/Os.java
@@ -0,0 +1,62 @@
+package bisq.wallets.regtest;
+
+import lombok.Getter;
+
+import java.util.Locale;
+
+public enum Os {
+    LINUX("linux"),
+    MAC_OS("macos"),
+    WINDOWS("win");
+
+    @Getter
+    private final String canonicalName;
+
+    Os(String canonicalName) {
+        this.canonicalName = canonicalName;
+    }
+
+    public static bisq.common.platform.OS getOS() {
+        String osName = getOsName();
+        if (isLinux(osName)) {
+            return bisq.common.platform.OS.LINUX;
+        } else if (isMacOs(osName)) {
+            return bisq.common.platform.OS.MAC_OS;
+        } else if (isWindows(osName)) {
+            return bisq.common.platform.OS.WINDOWS;
+        }
+        throw new IllegalStateException("Running on unsupported OS: " + osName);
+    }
+
+    public static boolean isLinux() {
+        return isLinux(getOsName());
+    }
+
+    public static boolean isLinux(String osName) {
+        return osName.contains("linux");
+    }
+
+    public static boolean isMacOs() {
+        return isMacOs(getOsName());
+    }
+
+    public static boolean isMacOs(String osName) {
+        return osName.contains("mac") || osName.contains("darwin");
+    }
+
+    public static boolean isWindows() {
+        return isWindows(getOsName());
+    }
+
+    public static boolean isWindows(String osName) {
+        return osName.contains("win");
+    }
+
+    public static String getOsName() {
+        return System.getProperty("os.name").toLowerCase(Locale.US);
+    }
+
+    public static String getOsVersion() {
+        return System.getProperty("os.version");
+    }
+}
diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/WalletStartupTests.java
@@ -17,7 +17,7 @@
 
 package bisq.wallets.regtest;
 
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
@@ -23,8 +23,8 @@
 import bisq.wallets.json_rpc.RpcCallFailureException;
 import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.DaemonProcess;
-import bisq.wallets.process.ProcessConfig;
+import bisq.wallets.regtest.process.DaemonProcess;
+import bisq.wallets.regtest.process.ProcessConfig;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
@@ -17,14 +17,14 @@
 
 package bisq.wallets.regtest.bitcoind;
 
-import bisq.common.platform.OS;
 import bisq.common.util.NetworkUtils;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindListUnspentResponse;
 import bisq.wallets.bitcoind.zmq.ZmqListeners;
 import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.regtest.AbstractRegtestSetup;
+import bisq.wallets.regtest.Os;
 import bisq.wallets.regtest.process.MultiProcessCoordinator;
 import lombok.Getter;
 
@@ -158,7 +158,7 @@ private Path installBitcoind(Path bitcoindBinaryDir) throws IOException {
                 throw new IllegalStateException("Couldn't extract bitcoind binary.");
             }
 
-            if (OS.isLinux() || OS.isMacOs()) {
+            if (Os.isLinux() || Os.isMacOs()) {
                 isSuccess = bitcoindPath.toFile().setExecutable(true);
                 if (!isSuccess) {
                     throw new IllegalStateException("Couldn't set executable bit on bitcoind binary.");

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/RemoteBitcoind.java
@@ -28,7 +28,7 @@
 import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.BisqProcess;
+import bisq.wallets.regtest.process.BisqProcess;
 import lombok.Getter;
 
 import java.util.ArrayList;

diff --git a/...ava/bisq/wallets/process/BisqProcess.java → .../wallets/regtest/process/BisqProcess.java b/...ava/bisq/wallets/process/BisqProcess.java → .../wallets/regtest/process/BisqProcess.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process;
+package bisq.wallets.regtest.process;
 
 public interface BisqProcess {
     void start() throws InterruptedException;

diff --git a/.../process/CannotStartProcessException.java → .../process/CannotStartProcessException.java b/.../process/CannotStartProcessException.java → .../process/CannotStartProcessException.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process;
+package bisq.wallets.regtest.process;
 
 public class CannotStartProcessException extends RuntimeException {
     public CannotStartProcessException(String message, Throwable cause) {

diff --git a/...a/bisq/wallets/process/DaemonProcess.java → ...allets/regtest/process/DaemonProcess.java b/...a/bisq/wallets/process/DaemonProcess.java → ...allets/regtest/process/DaemonProcess.java
@@ -15,11 +15,10 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process;
+package bisq.wallets.regtest.process;
 
 import bisq.common.file.FileUtils;
 import bisq.common.file.LogScanner;
-import bisq.wallets.core.exceptions.WalletStartupFailedException;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/MultiProcessCoordinator.java
@@ -17,8 +17,6 @@
 
 package bisq.wallets.regtest.process;
 
-import bisq.wallets.core.exceptions.WalletStartupFailedException;
-import bisq.wallets.process.BisqProcess;
 import com.google.common.collect.Lists;
 
 import java.util.List;

diff --git a/...a/bisq/wallets/process/ProcessConfig.java → ...allets/regtest/process/ProcessConfig.java b/...a/bisq/wallets/process/ProcessConfig.java → ...allets/regtest/process/ProcessConfig.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process;
+package bisq.wallets.regtest.process;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;

diff --git a/...eptions/WalletStartupFailedException.java → ...process/WalletStartupFailedException.java b/...eptions/WalletStartupFailedException.java → ...process/WalletStartupFailedException.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.core.exceptions;
+package bisq.wallets.regtest.process;
 
 public class WalletStartupFailedException extends RuntimeException {
     public WalletStartupFailedException(String message, Throwable cause) {