From 17be68281eae0be371be63db4c59d4ecaf2f1ba4 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 5 Feb 2026 21:20:21 +0100 Subject: migrate server to new db trait --- server/src/main.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'server/src/main.rs') diff --git a/server/src/main.rs b/server/src/main.rs index f3b68c7..37d71f2 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -10,8 +10,7 @@ use crate::{auth::token::SessionKey, logger::setup_logger}; use anyhow::Result; use jellycache::Cache; -use jellydb::table::Table; -use jellykv::Store; +use jellydb::Database; use log::{error, info}; use routes::build_rocket; use serde::Deserialize; @@ -50,13 +49,9 @@ async fn main() { pub struct State { pub config: Config, - pub cache: Cache, - pub database: Arc, + pub database: Arc, pub session_key: SessionKey, - - pub nodes: Table, - pub users: Table, } #[derive(Debug, Deserialize)] @@ -82,8 +77,6 @@ pub fn create_state() -> Result> { cache: Cache::new(Box::new(cache_storage), config.max_memory_cache_size), database: Arc::new(db_storage), session_key: SessionKey::parse(&config.session_key)?, - nodes: Table::new(0), - users: Table::new(1), config, })) } -- cgit v1.3