do not fail on getHeight() error, sync progress timeout is treated as unresponsive

Author: woodser

core/src/main/java/haveno/core/trade/HavenoUtils.java

@@ -44,6 +44,7 @@
 import haveno.core.trade.statistics.TradeStatisticsManager;
 import haveno.core.user.Preferences;
 import haveno.core.util.JsonUtil;
+import haveno.core.xmr.wallet.XmrWalletBase;
 import haveno.core.xmr.wallet.XmrWalletService;
 import haveno.network.p2p.NodeAddress;
 
@@ -626,7 +627,7 @@ public static boolean isReadTimeout(Throwable e) {
     }
 
     public static boolean isUnresponsive(Throwable e) {
-        return isConnectionRefused(e) || isReadTimeout(e);
+        return isConnectionRefused(e) || isReadTimeout(e) || XmrWalletBase.isSyncWithProgressTimeout(e);
     }
 
     public static boolean isNotEnoughSigners(Throwable e) {

core/src/main/java/haveno/core/xmr/wallet/XmrWalletBase.java

@@ -31,6 +31,7 @@ public abstract class XmrWalletBase {
     public static final int SYNC_PROGRESS_TIMEOUT_SECONDS = 120;
     public static final int DIRECT_SYNC_WITHIN_BLOCKS = 100;
     public static final int SAVE_WALLET_DELAY_SECONDS = 300;
+    private static final String SYNC_PROGRESS_TIMEOUT_MSG = "Sync progress timeout called";
 
     // inherited
     protected MoneroWallet wallet;
@@ -114,12 +115,6 @@ public void onSyncProgress(long height, long startHeight, long endHeight, double
                         log.warn("Error getting wallet height while syncing with progress: " + e.getMessage());
                         log.warn(ExceptionUtils.getStackTrace(e));
                     }
-
-                    // stop polling and release latch
-                    syncProgressLooper.stop();
-                    syncProgressTimeout.stop();
-                    syncProgressError = e;
-                    syncProgressLatch.countDown();
                     return;
                 }
                 long appliedTargetHeight = repeatSyncToLatestHeight ? xmrConnectionService.getTargetHeight() : targetHeightAtStart;
@@ -168,6 +163,10 @@ public void saveWalletWithDelay() {
 
     // --------------------------------- ABSTRACT -----------------------------
 
+    public static boolean isSyncWithProgressTimeout(Throwable e) {
+        return e.getMessage().equals(SYNC_PROGRESS_TIMEOUT_MSG);
+    }
+
     public abstract void saveWallet();
 
     public abstract void requestSaveWallet();
@@ -201,7 +200,7 @@ private synchronized void resetSyncProgressTimeout() {
         if (syncProgressTimeout != null) syncProgressTimeout.stop();
         syncProgressTimeout = UserThread.runAfter(() -> {
             if (isShutDownStarted) return;
-            syncProgressError = new RuntimeException("Sync progress timeout called");
+            syncProgressError = new RuntimeException(SYNC_PROGRESS_TIMEOUT_MSG);
             syncProgressLatch.countDown();
         }, SYNC_PROGRESS_TIMEOUT_SECONDS, TimeUnit.SECONDS);
     }