Move DaemonProcess to wallets.regtest module

bisq-network · Sep 4, 2024 · ed3edf8 · ed3edf8
1 parent b76d475
commit ed3edf8
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
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,7 +20,7 @@
 import bisq.common.file.InputStreamScanner;
 import bisq.common.file.LogScanner;
 import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.process.DaemonProcess;
+import bisq.wallets.regtest.process.DaemonProcess;
 import bisq.wallets.process.ProcessConfig;
 import lombok.extern.slf4j.Slf4j;
 

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 com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

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/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/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,7 +23,7 @@
 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.regtest.process.DaemonProcess;
 import bisq.wallets.process.ProcessConfig;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

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/...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,12 @@
  * 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 bisq.wallets.process.CannotStartProcessException;
+import bisq.wallets.process.ProcessConfig;
 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/...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) {