From d1c9f5bfecd987761749c2c0b93f6333a171d01e Mon Sep 17 00:00:00 2001
From: Shing Him Ng <shinghim@protonmail.com>
Date: Wed, 15 Jan 2025 21:36:53 -0600
Subject: [PATCH] Qualify errors from db.rs as db::Error rather than importing

This makes more sense since it's not the top-level error in
the modules that were importing it
---
 payjoin-directory/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/payjoin-directory/src/lib.rs b/payjoin-directory/src/lib.rs
index 17bf3a37..91abd878 100644
--- a/payjoin-directory/src/lib.rs
+++ b/payjoin-directory/src/lib.rs
@@ -15,7 +15,7 @@ use tokio::net::TcpListener;
 use tokio::sync::Mutex;
 use tracing::{debug, error, info, trace};
 
-use crate::db::{DbPool, Error};
+use crate::db::DbPool;
 
 pub const DEFAULT_DIR_PORT: u16 = 8080;
 pub const DEFAULT_DB_HOST: &str = "localhost:6379";
@@ -314,17 +314,17 @@ impl From<hyper::http::Error> for HandlerError {
 }
 
 fn handle_peek(
-    result: Result<Vec<u8>, Error>,
+    result: Result<Vec<u8>, db::Error>,
     timeout_response: Response<BoxBody<Bytes, hyper::Error>>,
 ) -> Result<Response<BoxBody<Bytes, hyper::Error>>, HandlerError> {
     match result {
         Ok(buffered_req) => Ok(Response::new(full(buffered_req))),
         Err(e) => match e {
-            Error::Redis(re) => {
+            db::Error::Redis(re) => {
                 error!("Redis error: {}", re);
                 Err(HandlerError::InternalServerError(anyhow::Error::msg("Internal server error")))
             }
-            Error::Timeout(_) => Ok(timeout_response),
+            db::Error::Timeout(_) => Ok(timeout_response),
         },
     }
 }