From 0569e0b87482bc6732c326270318d82f56ce4a85 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 7 Feb 2023 12:19:49 -0800
Subject: [PATCH] Improve error messages related to cookie file (#1537)

---
 src/options.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/options.rs b/src/options.rs
index ea8ce585e0..ea51a3905e 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -130,7 +130,9 @@ impl Options {
   }
 
   pub(crate) fn bitcoin_rpc_client(&self) -> Result<Client> {
-    let cookie_file = self.cookie_file()?;
+    let cookie_file = self
+      .cookie_file()
+      .map_err(|err| anyhow!("failed to get cookie file path: {err}"))?;
 
     let rpc_url = self.rpc_url();
 
@@ -139,8 +141,13 @@ impl Options {
       cookie_file.display()
     );
 
-    let client = Client::new(&rpc_url, Auth::CookieFile(cookie_file))
-      .with_context(|| format!("failed to connect to Bitcoin Core RPC at {rpc_url}"))?;
+    let client =
+      Client::new(&rpc_url, Auth::CookieFile(cookie_file.clone())).with_context(|| {
+        format!(
+          "failed to connect to Bitcoin Core RPC at {rpc_url} using cookie file {}",
+          cookie_file.display()
+        )
+      })?;
 
     let rpc_chain = match client.get_blockchain_info()?.chain.as_str() {
       "main" => Chain::Mainnet,