diff --git a/src/main.rs b/src/main.rs index 21a291d..456a9e9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -117,9 +117,8 @@ mod tests { use common_multipart_rfc7578::client::multipart::{ Body as MultipartBody, Form as MultipartForm, }; - use std::{time::Duration, usize}; + use std::{usize}; use tower::ServiceExt; - use tower_http::timeout::TimeoutLayer; mod db_mgr { use std::str::FromStr; @@ -199,12 +198,11 @@ mod tests { mod init { pub async fn app(pool: sqlx::PgPool) -> axum::Router { - let app = crate::init::routes() + crate::init::routes() .await .layer(axum::Extension(pool)) .layer(axum::extract::DefaultBodyLimit::max(1024 * 1024 * 1024)) - .layer(tower_http::timeout::TimeoutLayer::new(std::time::Duration::from_secs(300))); - app + .layer(tower_http::timeout::TimeoutLayer::new(std::time::Duration::from_secs(300))) } } @@ -278,11 +276,7 @@ mod tests { let pool = db_mgr::connect_to_db(&db_name).await.unwrap(); db::migrations(&pool).await; - let app = crate::init::routes() - .await - .layer(axum::Extension(pool)) - .layer(axum::extract::DefaultBodyLimit::max(1024 * 1024 * 1024)) - .layer(TimeoutLayer::new(Duration::from_secs(300))); + let app = init::app(pool).await; // Create multipart form let mut form = MultipartForm::default(); @@ -356,11 +350,7 @@ mod tests { let pool = db_mgr::connect_to_db(&db_name).await.unwrap(); db::migrations(&pool).await; - let app = crate::init::routes() - .await - .layer(axum::Extension(pool)) - .layer(axum::extract::DefaultBodyLimit::max(1024 * 1024 * 1024)) - .layer(TimeoutLayer::new(Duration::from_secs(300))); + let app = init::app(pool).await; // Create multipart form let mut form = MultipartForm::default();