Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wallets: Remove dependency to Bisq 2 Threading Class #2812

Merged
merged 2 commits into from
Sep 12, 2024
Merged

wallets: Remove dependency to Bisq 2 Threading Class #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65a3ea6
wallets: Remove dependency to Bisq 2 Hex Class
alvasw Sep 11, 2024
d221ad0
wallets: Remove dependency to Bisq 2 Threading Class
alvasw Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/BitcoindRawTxProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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);
Expand Down
16 changes: 13 additions & 3 deletions wallets/bitcoind/bitcoind/src/main/java/bisq/wallets/bitcoind/zmq/ZmqConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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;

Expand Down Expand Up @@ -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);
}
}
Loading