From c87f13bfb09cbf295c9bb3b743fa08698d0a000a Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Tue, 17 Sep 2024 14:50:23 +0800
Subject: [PATCH 1/2] Don't log bitcoin core connect

---
 src/index/reorg.rs | 10 +++++-----
 src/settings.rs    | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/index/reorg.rs b/src/index/reorg.rs
index 1a7ed999cf..88684830d4 100644
--- a/src/index/reorg.rs
+++ b/src/index/reorg.rs
@@ -83,7 +83,11 @@ impl Reorg {
       return Ok(());
     }
 
-    if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0)
+    let wtx = index.begin_write()?;
+
+    let savepoints = wtx.list_persistent_savepoints()?.collect::<Vec<u64>>();
+
+    if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0 || savepoints.len() < 2)
       && u32::try_from(
         index
           .settings
@@ -95,10 +99,6 @@ impl Reorg {
       .saturating_sub(height)
         <= CHAIN_TIP_DISTANCE
     {
-      let wtx = index.begin_write()?;
-
-      let savepoints = wtx.list_persistent_savepoints()?.collect::<Vec<u64>>();
-
       if savepoints.len() >= usize::try_from(MAX_SAVEPOINTS).unwrap() {
         wtx.delete_persistent_savepoint(savepoints.into_iter().min().unwrap())?;
       }
diff --git a/src/settings.rs b/src/settings.rs
index 3482286e00..ee9ca610ab 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -410,13 +410,13 @@ impl Settings {
 
     let bitcoin_credentials = self.bitcoin_credentials()?;
 
-    log::info!(
+    log::trace!(
       "Connecting to Bitcoin Core at {}",
       self.bitcoin_rpc_url(None)
     );
 
     if let Auth::CookieFile(cookie_file) = &bitcoin_credentials {
-      log::info!(
+      log::trace!(
         "Using credentials from cookie file at `{}`",
         cookie_file.display()
       );
@@ -428,8 +428,16 @@ impl Settings {
       );
     }
 
-    let client = Client::new(&rpc_url, bitcoin_credentials)
-      .with_context(|| format!("failed to connect to Bitcoin Core RPC at `{rpc_url}`"))?;
+    let client = Client::new(&rpc_url, bitcoin_credentials.clone()).with_context(|| {
+      format!(
+        "failed to connect to Bitcoin Core RPC at `{rpc_url}` with {}",
+        match bitcoin_credentials {
+          Auth::None => "no credentials".into(),
+          Auth::UserPass(_, _) => "username and password".into(),
+          Auth::CookieFile(cookie_file) => format!("cookie file at {}", cookie_file.display()),
+        }
+      )
+    })?;
 
     let mut checks = 0;
     let rpc_chain = loop {

From 5722801dc0a4267587eca7c49e0c65858ff84006 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Tue, 17 Sep 2024 16:05:37 +0800
Subject: [PATCH 2/2] Amend

---
 src/index/reorg.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/index/reorg.rs b/src/index/reorg.rs
index 88684830d4..1a7ed999cf 100644
--- a/src/index/reorg.rs
+++ b/src/index/reorg.rs
@@ -83,11 +83,7 @@ impl Reorg {
       return Ok(());
     }
 
-    let wtx = index.begin_write()?;
-
-    let savepoints = wtx.list_persistent_savepoints()?.collect::<Vec<u64>>();
-
-    if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0 || savepoints.len() < 2)
+    if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0)
       && u32::try_from(
         index
           .settings
@@ -99,6 +95,10 @@ impl Reorg {
       .saturating_sub(height)
         <= CHAIN_TIP_DISTANCE
     {
+      let wtx = index.begin_write()?;
+
+      let savepoints = wtx.list_persistent_savepoints()?.collect::<Vec<u64>>();
+
       if savepoints.len() >= usize::try_from(MAX_SAVEPOINTS).unwrap() {
         wtx.delete_persistent_savepoint(savepoints.into_iter().min().unwrap())?;
       }