httpd: Move `test` utility mod from inside `api` to root

Signed-off-by: xphoniex <dj.2dixx@gmail.com>

radicle-httpd/src/api.rs

@@ -1,5 +1,4 @@
-#[cfg(test)]
+pub mod auth;
-pub mod test;
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -21,7 +20,6 @@ use radicle::identity::Id;
 use radicle::storage::{ReadRepository, ReadStorage};
 use radicle::Profile;
 
-mod auth;
 mod axum_extra;
 mod error;
 mod json;
@@ -70,6 +68,11 @@ impl Context {
     pub fn profile(&self) -> &Arc<Profile> {
         &self.profile
     }
+
+    #[cfg(test)]
+    pub fn sessions(&self) -> &Arc<RwLock<HashMap<SessionId, auth::Session>>> {
+        &self.sessions
+    }
 }
 
 pub fn router(ctx: Context) -> Router {

radicle-httpd/src/api/v1/delegates.rs

@@ -74,7 +74,7 @@ mod routes {
     use axum::http::StatusCode;
     use serde_json::json;
 
-    use crate::api::test::{self, get, HEAD};
+    use crate::test::{self, get, HEAD};
 
     #[tokio::test]
     async fn test_delegates_projects() {

radicle-httpd/src/api/v1/projects.rs

@@ -562,7 +562,7 @@ mod routes {
     use pretty_assertions::assert_eq;
     use serde_json::json;
 
-    use crate::api::test::{self, get, patch, post, HEAD, HEAD_1, ISSUE_ID, PATCH_ID};
+    use crate::test::{self, get, patch, post, HEAD, HEAD_1, ISSUE_ID, PATCH_ID};
 
     const CREATED_ISSUE_ID: &str = "b56febfba1e7dd20f4aea43ca2fe9dcf1fd448ba";
 

radicle-httpd/src/api/v1/sessions.rs

@@ -125,10 +125,8 @@ mod routes {
     use axum::http::StatusCode;
     use radicle_cli::commands::rad_web::{self, SessionInfo};
 
-    use crate::api::{
+    use crate::api::auth::{AuthState, Session};
-        auth::{AuthState, Session},
+    use crate::test::{self, get, post, put};
-        test::{self, get, post, put},
-    };
 
     #[tokio::test]
     async fn test_session() {

radicle-httpd/src/api/v1/stats.rs

@@ -29,7 +29,7 @@ mod routes {
     use axum::http::StatusCode;
     use serde_json::json;
 
-    use crate::api::test::{self, get};
+    use crate::test::{self, get};
 
     #[tokio::test]
     async fn test_stats() {

radicle-httpd/src/git.rs

@@ -203,7 +203,7 @@ mod routes {
     use axum::http::{Method, StatusCode};
     use tower::ServiceExt;
 
-    use crate::api::test;
+    use crate::test;
 
     #[tokio::test]
     async fn test_invalid_route_returns_404() {

radicle-httpd/src/lib.rs

@@ -17,6 +17,8 @@ use tracing::Span;
 
 mod api;
 mod git;
+#[cfg(test)]
+mod test;
 
 #[derive(Debug, Clone)]
 pub struct Options {
@@ -30,9 +32,11 @@ pub async fn run(options: Options) -> anyhow::Result<()> {
         .output()
         .context("'git' command must be available")?
         .stdout;
+
     tracing::info!("{}", str::from_utf8(&git_version)?.trim());
 
     let profile = Arc::new(radicle::Profile::load()?);
+
     tracing::info!("using radicle home at {}", profile.home().display());
 
     let ctx = api::Context::new(profile.clone());

radicle-httpd/src/test.rs

@@ -136,21 +136,18 @@ pub fn seed(dir: &Path) -> Context {
         )
         .unwrap();
 
-    Context {
+    Context::new(Arc::new(profile))
-        profile: Arc::new(profile),
-        sessions: Default::default(),
-    }
 }
 
 /// Adds an authorized session to the Context::sessions HashMap.
 pub async fn create_session(ctx: Context) {
     let issued_at = OffsetDateTime::now_utc();
-    let mut sessions = ctx.sessions.write().await;
+    let mut sessions = ctx.sessions().write().await;
     sessions.insert(
         String::from("u9MGAkkfkMOv0uDDB2WeUHBT7HbsO2Dy"),
         auth::Session {
             status: auth::AuthState::Authorized,
-            public_key: ctx.profile.public_key,
+            public_key: ctx.profile().public_key,
             issued_at,
             expires_at: issued_at
                 .checked_add(auth::AUTHORIZED_SESSIONS_EXPIRATION)