Move Scanners to bisq.wallets.regtest module

wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java

@@ -17,9 +17,9 @@
 
 package bisq.wallets.bitcoind.zmq;
 
-import bisq.common.encoding.Hex;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindDecodeRawTransactionResponse;
+import com.google.common.io.BaseEncoding;
 
 public class BitcoindRawTxProcessor implements ZmqRawTxProcessor {
 
@@ -33,7 +33,7 @@ public BitcoindRawTxProcessor(BitcoindDaemon daemon, ZmqListeners listeners) {
 
  @Override
  public void processRawTx(byte[] serializedTx, byte[] sequenceNumber) {
- String txInHex = Hex.encode(serializedTx);
+ String txInHex = BaseEncoding.base16().lowerCase().encode(serializedTx);
  BitcoindDecodeRawTransactionResponse.Result rawTransaction = daemon.decodeRawTransaction(txInHex).getResult();
  listeners.fireTxOutputAddressesListeners(rawTransaction);
  listeners.fireTxIdInputListeners(rawTransaction);

wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java

@@ -17,10 +17,10 @@
 
 package bisq.wallets.bitcoind.zmq;
 
-import bisq.common.threading.ExecutorFactory;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindGetZmqNotificationsResponse;
 import bisq.wallets.bitcoind.zmq.exceptions.CannotFindZmqAddressException;
 import bisq.wallets.bitcoind.zmq.exceptions.CannotFindZmqTopicException;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.zeromq.SocketType;
@@ -33,6 +33,8 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -45,8 +47,8 @@ public class ZmqConnection implements AutoCloseable {
  @Getter
  private final ZmqListeners listeners;
 
- private final ExecutorService executorService = ExecutorFactory
- .newFixedThreadPool("wallet-zeromq-notification-thread-pool", 2);
+ private final ExecutorService executorService =
+ newFixedThreadPool("wallet-zeromq-notification-thread-pool", 2);
 
  private ZContext context;
 
@@ -151,4 +153,12 @@ private boolean isSocketClosed(int errorCode) {
  private boolean isZeroMqContextTerminated(int errorCode) {
  return errorCode == ERROR_CODE_CONTEXT_TERMINATED;
  }
+
+ public ExecutorService newFixedThreadPool(String name, int numThreads) {
+ ThreadFactory threadFactory = new ThreadFactoryBuilder()
+ .setNameFormat(name + "-%d")
+ .setDaemon(true)
+ .build();
+ return Executors.newFixedThreadPool(numThreads, threadFactory);
+ }
 }

wallets/bitcoind/bitcoind/src/test/java/bisq/wallets/bitcoind/WalletNotRunningTest.java

@@ -17,21 +17,23 @@
 
 package bisq.wallets.bitcoind;
 
-import bisq.common.util.NetworkUtils;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
-import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.JsonRpcClient;
+import bisq.wallets.json_rpc.RpcClientFactory;
+import bisq.wallets.json_rpc.RpcConfig;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
 import java.net.ConnectException;
+import java.net.ServerSocket;
+import java.util.Random;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class WalletNotRunningTest {
  @Test
  void notRunningTest() {
- int freePort = NetworkUtils.findFreeSystemPort();
+ int freePort = findFreeSystemPort();
 
  RpcConfig rpcConfig = RpcConfig.builder()
  .hostname("127.0.0.1")
@@ -46,4 +48,15 @@ void notRunningTest() {
  assertThatThrownBy(minerChainBackend::listWallets)
  .hasCauseInstanceOf(ConnectException.class);
  }
+
+ public static int findFreeSystemPort() {
+ try {
+ ServerSocket server = new ServerSocket(0);
+ int port = server.getLocalPort();
+ server.close();
+ return port;
+ } catch (IOException ignored) {
+ return new Random().nextInt(10000) + 50000;
+ }
+ }
 }

wallets/bitcoind/json-rpc/src/main/java/bisq/wallets/json_rpc/JsonRpcCall.java

@@ -17,7 +17,7 @@
 
 package bisq.wallets.json_rpc;
 
-import bisq.common.util.StringUtils;
+import java.util.UUID;
 
 @SuppressWarnings("ALL")
 public class JsonRpcCall {
@@ -27,7 +27,7 @@ public class JsonRpcCall {
  private final Object params;
 
  public JsonRpcCall(String method, Object params) {
- this.id = StringUtils.createUid();
+ this.id = UUID.randomUUID().toString();
  this.method = method;
  this.params = params;
  }

wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/AbstractRegtestSetup.java

@@ -17,12 +17,15 @@
 
 package bisq.wallets.regtest;
 
-import bisq.common.file.FileUtils;
 import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.regtest.process.BisqProcess;
 
 import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
 public abstract class AbstractRegtestSetup<T extends BisqProcess> implements BisqProcess {
@@ -32,7 +35,7 @@ public abstract class AbstractRegtestSetup<T extends BisqProcess> implements Bis
  protected final Path tmpDirPath;
 
  public AbstractRegtestSetup() throws IOException {
- this.tmpDirPath = FileUtils.createTempDir();
+ this.tmpDirPath = createTempDir();
  }
 
  protected abstract T createProcess();
@@ -49,4 +52,40 @@ public void shutdown() {
  public abstract List<String> mineOneBlock() throws InterruptedException;
 
  public abstract RpcConfig getRpcConfig();
+
+ public static Path createTempDir() throws IOException {
+ Path tempDirPath = Files.createTempDirectory(null);
+ recursiveDeleteOnShutdownHook(tempDirPath);
+ return tempDirPath;
+ }
+
+ public static void recursiveDeleteOnShutdownHook(Path path) {
+ Runtime.getRuntime().addShutdownHook(new Thread(
+ () -> {
+ try {
+ Files.walkFileTree(path, new SimpleFileVisitor<>() {
+ @Override
+ public FileVisitResult visitFile(Path file,
+ @SuppressWarnings("unused") BasicFileAttributes attrs)
+ throws IOException {
+ Files.delete(file);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException e)
+ throws IOException {
+ if (e == null) {
+ Files.delete(dir);
+ return FileVisitResult.CONTINUE;
+ }
+ // directory iteration failed
+ throw e;
+ }
+ });
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to delete " + path, e);
+ }
+ }));
+ }
 }

common/src/main/java/bisq/common/file/FileScanner.java → wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/FileScanner.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
+package bisq.wallets.regtest;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/bisq/common/file/InputStreamScanner.java → wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/InputStreamScanner.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
+package bisq.wallets.regtest;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/bisq/common/file/LogScanner.java → wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/LogScanner.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.file;
+package bisq.wallets.regtest;
 
 import java.io.IOException;
 import java.util.HashSet;

wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java

@@ -17,7 +17,6 @@
 
 package bisq.wallets.regtest.bitcoind;
 
-import bisq.common.util.NetworkUtils;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.RpcCallFailureException;
@@ -53,15 +52,15 @@ public BitcoindRegtestProcess(Path binaryPath, RpcConfig rpcConfig, Path dataDir
 
  @Override
  public ProcessConfig createProcessConfig() {
- int zmqPort = NetworkUtils.findFreeSystemPort();
+ int zmqPort = BitcoindRegtestSetup.findFreeSystemPort();
  return ProcessConfig.builder()
  .name(binaryPath.toAbsolutePath().toString())
  .args(List.of(
  "-regtest",
  "-datadir=" + dataDir.toAbsolutePath(),
  "-debug=1",
 
- "-bind=127.0.0.1:" + NetworkUtils.findFreeSystemPort(),
+ "-bind=127.0.0.1:" + BitcoindRegtestSetup.findFreeSystemPort(),
  "-whitelist=127.0.0.1",
 
  "-rpcbind=127.0.0.1:" + rpcConfig.getPort(),

wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java

@@ -17,7 +17,6 @@
 
 package bisq.wallets.regtest.bitcoind;
 
-import bisq.common.util.NetworkUtils;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
 import bisq.wallets.bitcoind.rpc.BitcoindWallet;
 import bisq.wallets.bitcoind.rpc.responses.BitcoindListUnspentResponse;
@@ -31,11 +30,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Random;
 
 public class BitcoindRegtestSetup
  extends AbstractRegtestSetup<MultiProcessCoordinator> {
@@ -101,7 +102,7 @@ public static RpcConfig createRpcConfig(String hostname, int port) {
  }
 
  private RpcConfig createRpcConfig() {
- int port = NetworkUtils.findFreeSystemPort();
+ int port = findFreeSystemPort();
  return createRpcConfig("127.0.0.1", port);
  }
 
@@ -168,4 +169,15 @@ private Path installBitcoind(Path bitcoindBinaryDir) throws IOException {
  return bitcoindPath;
  }
  }
+
+ public static int findFreeSystemPort() {
+ try {
+ ServerSocket server = new ServerSocket(0);
+ int port = server.getLocalPort();
+ server.close();
+ return port;
+ } catch (IOException ignored) {
+ return new Random().nextInt(10000) + 50000;
+ }
+ }
 }

wallets/bitcoind/regtest/src/main/java/bisq/wallets/regtest/process/DaemonProcess.java

@@ -17,12 +17,12 @@
 
 package bisq.wallets.regtest.process;
 
-import bisq.common.file.FileUtils;
-import bisq.common.file.LogScanner;
 import bisq.common.threading.ThreadName;
+import bisq.wallets.regtest.LogScanner;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -48,7 +48,7 @@ public DaemonProcess(Path dataDir) {
  @Override
  public void start() {
  try {
- FileUtils.makeDirs(dataDir.toFile());
+ makeDirs(dataDir.toFile());
  process = createAndStartProcess();
  waitUntilReady();
  } catch (IOException e) {
@@ -120,4 +120,10 @@ protected boolean waitUntilLogContainsLines() {
  throw new CannotStartProcessException(processName, e);
  }
  }
+
+ private static void makeDirs(File dir) throws IOException {
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("Could not make dir " + dir);
+ }
+ }
 }

wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java

@@ -17,8 +17,8 @@
 
 package bisq.wallets.electrum.regtest.electrumx;
 
-import bisq.common.file.InputStreamScanner;
-import bisq.common.file.LogScanner;
+import bisq.wallets.regtest.InputStreamScanner;
+import bisq.wallets.regtest.LogScanner;
 import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.regtest.process.DaemonProcess;
 import bisq.wallets.regtest.process.ProcessConfig;

wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumRegtestProcess.java

@@ -18,14 +18,14 @@
 package bisq.wallets.electrum;
 
 import bisq.common.file.FileCreationWatcher;
-import bisq.common.file.FileScanner;
 import bisq.common.file.FileUtils;
-import bisq.common.file.LogScanner;
 import bisq.wallets.electrum.rpc.ElectrumDaemon;
 import bisq.wallets.electrum.rpc.ElectrumProcessConfig;
 import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.json_rpc.RpcConfig;
+import bisq.wallets.regtest.FileScanner;
+import bisq.wallets.regtest.LogScanner;
 import bisq.wallets.regtest.process.DaemonProcess;
 import bisq.wallets.regtest.process.ProcessConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;