diff --git a/wallets/electrum/build.gradle.kts b/wallets/electrum/build.gradle.kts index 94aaa7255b..bd00b58c9c 100644 --- 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/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrum/ElectrumRegtest.java b/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrum/ElectrumRegtest.java index 63341fe518..b32768fc98 100644 --- a/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrum/ElectrumRegtest.java +++ b/wallets/electrum/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/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java b/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java index 3653361b00..dcfb4e8412 100644 --- a/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java +++ b/wallets/electrum/src/integrationTest/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 index 1510386770..e4988b75d0 100644 --- 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 index 3520a95d26..c8906b5ff9 100644 --- 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 index 0eef33f032..1bd0e42fa6 100644 --- 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 index 6237699abf..20ad193519 100644 --- 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 index 9b5dd9d9f6..0d725bcbeb 100644 --- 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 index e3856a212f..9abfa79ab1 100644 --- 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 index 8c37458290..7cc45b3b44 100644 --- 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 index d25793c6d3..11e71c42e8 100644 --- 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/wallets/process/src/main/java/bisq/wallets/process/BisqProcess.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java similarity index 95% rename from wallets/process/src/main/java/bisq/wallets/process/BisqProcess.java rename to wallets/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java index ad7ee23862..46b65f467d 100644 --- a/wallets/process/src/main/java/bisq/wallets/process/BisqProcess.java +++ b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/BisqProcess.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.wallets.process; +package bisq.wallets.regtest.process; public interface BisqProcess { void start() throws InterruptedException; diff --git a/wallets/process/src/main/java/bisq/wallets/process/DaemonProcess.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java similarity index 96% rename from wallets/process/src/main/java/bisq/wallets/process/DaemonProcess.java rename to wallets/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java index 942804317a..cca19adbf6 100644 --- a/wallets/process/src/main/java/bisq/wallets/process/DaemonProcess.java +++ b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java @@ -15,11 +15,12 @@ * along with Bisq. If not, see . */ -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 index 76842ee962..fb6c78c328 100644 --- 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/wallets/core/src/main/java/bisq/wallets/core/exceptions/WalletStartupFailedException.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java similarity index 95% rename from wallets/core/src/main/java/bisq/wallets/core/exceptions/WalletStartupFailedException.java rename to wallets/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java index d064ee8a1d..77fbbedc2d 100644 --- a/wallets/core/src/main/java/bisq/wallets/core/exceptions/WalletStartupFailedException.java +++ b/wallets/regtest/src/main/java/bisq/wallets/regtest/process/WalletStartupFailedException.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.wallets.core.exceptions; +package bisq.wallets.regtest.process; public class WalletStartupFailedException extends RuntimeException { public WalletStartupFailedException(String message, Throwable cause) {