From fcde129920539db9d0dd30911003edc5f4043103 Mon Sep 17 00:00:00 2001
From: icyfestive <>
Date: Wed, 11 Jan 2023 15:40:58 +0000
Subject: [PATCH] fix warning behaviour around monero-rpc failing to fetch
 transactions

don't warn the user that monero-wallet-rpc has failed to fetch a
transaction until it's happened several times.

monero-wallet-rpc may legitimately fail the first time we make a request
---
 swap/src/monero/wallet.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/swap/src/monero/wallet.rs b/swap/src/monero/wallet.rs
index a8fccc5d..523943ba 100644
--- a/swap/src/monero/wallet.rs
+++ b/swap/src/monero/wallet.rs
@@ -296,6 +296,7 @@ async fn wait_for_confirmations<C: monero_rpc::wallet::MoneroWalletRpc<reqwest::
     wallet_name: String,
 ) -> Result<(), InsufficientFunds> {
     let mut seen_confirmations = 0u64;
+    let mut monero_rpc_retries = 0;
 
     while seen_confirmations < conf_target {
         check_interval.tick().await; // tick() at the beginning of the loop so every `continue` tick()s as well
@@ -317,8 +318,11 @@ async fn wait_for_confirmations<C: monero_rpc::wallet::MoneroWalletRpc<reqwest::
                 message,
                 data,
             })) => {
+                monero_rpc_retries += 1;
                 tracing::debug!(message, ?data);
-                tracing::warn!(%txid, message, "`monero-wallet-rpc` failed to fetch transaction, may need to be restarted");
+                if monero_rpc_retries > 5 {
+                    tracing::warn!(%txid, message, "`monero-wallet-rpc` failed to fetch transaction, may need to be restarted");
+                }
                 continue;
             }
             // TODO: Implement this using a generic proxy for each function call once https://github.com/thomaseizinger/rust-jsonrpc-client/issues/47 is fixed.