chore(server): Simplify the database support

1 files changed, 8 insertions, 8 deletions

diff --git a/crates/turtle/src/atuin_server/mod.rs b/crates/turtle/src/atuin_server/mod.rs
index ad480e1d..c96a13bc 100644
--- a/crates/turtle/src/atuin_server/mod.rs
+++ b/crates/turtle/src/atuin_server/mod.rs
@@ -1,14 +1,14 @@
 use std::future::Future;
 use std::net::SocketAddr;
 
-use crate::atuin_server_database::Database;
 use axum::{Router, serve};
+use database::db::Database;
 use eyre::{Context, Result};
 
+pub(crate) mod database;
 mod handlers;
 mod metrics;
 mod router;
-mod utils;
 
 pub(crate) use settings::Settings;
 
@@ -31,8 +31,8 @@ async fn shutdown_signal() {
     eprintln!("Shutting down gracefully...");
 }
 
-pub(crate) async fn launch<Db: Database>(settings: Settings, addr: SocketAddr) -> Result<()> {
-    launch_with_tcp_listener::<Db>(
+pub(crate) async fn launch(settings: Settings, addr: SocketAddr) -> Result<()> {
+    launch_with_tcp_listener(
         settings,
         TcpListener::bind(addr)
             .await
@@ -42,12 +42,12 @@ pub(crate) async fn launch<Db: Database>(settings: Settings, addr: SocketAddr) -
     .await
 }
 
-pub(crate) async fn launch_with_tcp_listener<Db: Database>(
+pub(crate) async fn launch_with_tcp_listener(
     settings: Settings,
     listener: TcpListener,
     shutdown: impl Future<Output = ()> + Send + 'static,
 ) -> Result<()> {
-    let r = make_router::<Db>(settings).await?;
+    let r = make_router(settings).await?;
 
     serve(listener, r.into_make_service())
         .with_graceful_shutdown(shutdown)
@@ -77,8 +77,8 @@ pub(crate) async fn launch_metrics_server(host: String, port: u16) -> Result<()>
     Ok(())
 }
 
-async fn make_router<Db: Database>(settings: Settings) -> Result<Router, eyre::Error> {
-    let db = Db::new(&settings.db_settings)
+async fn make_router(settings: Settings) -> Result<Router, eyre::Error> {
+    let db = Database::new(&settings.db_settings)
         .await
         .wrap_err_with(|| format!("failed to connect to db: {:?}", settings.db_settings))?;
     let r = router::router(db, settings);