From 11f1d75f2792bb1a3d95601327a39652155fa3bf Mon Sep 17 00:00:00 2001 From: woodser Date: Sun, 2 Apr 2023 13:07:06 -0400 Subject: [PATCH] fixed difficulty 400 --- Makefile | 4 ++-- .../main/java/haveno/core/api/CoreNotificationService.java | 2 +- core/src/main/java/haveno/core/trade/Trade.java | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 014355c8d4..8d36b2b456 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ monerod-local1: --no-zmq \ --add-exclusive-node 127.0.0.1:28080 \ --rpc-access-control-origins http://localhost:8080 \ - --fixed-difficulty 300 + --fixed-difficulty 400 monerod-local2: ./.localnet/monerod \ @@ -85,7 +85,7 @@ monerod-local2: --confirm-external-bind \ --add-exclusive-node 127.0.0.1:48080 \ --rpc-access-control-origins http://localhost:8080 \ - --fixed-difficulty 300 + --fixed-difficulty 400 funding-wallet-stagenet: ./.localnet/monero-wallet-rpc \ diff --git a/core/src/main/java/haveno/core/api/CoreNotificationService.java b/core/src/main/java/haveno/core/api/CoreNotificationService.java index 0ece8be202..f7646a5758 100644 --- a/core/src/main/java/haveno/core/api/CoreNotificationService.java +++ b/core/src/main/java/haveno/core/api/CoreNotificationService.java @@ -70,7 +70,7 @@ public class CoreNotificationService { .setType(NotificationType.ERROR) .setTimestamp(System.currentTimeMillis()) .setTitle(title) - .setMessage(errorMessage) + .setMessage(errorMessage == null ? "null" : errorMessage) .build()); } } diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java index 87ea88e4cc..ef11219571 100644 --- a/core/src/main/java/haveno/core/trade/Trade.java +++ b/core/src/main/java/haveno/core/trade/Trade.java @@ -784,7 +784,6 @@ public abstract class Trade implements Tradable, Model { private void closeWallet() { synchronized (walletLock) { if (wallet == null) throw new RuntimeException("Trade wallet to close was not previously opened for trade " + getId()); - if (wallet.getPath() == null) log.warn("HOW DID PATH BECOME NULL?"); xmrWalletService.closeWallet(wallet, true); wallet = null; }