refactor: move handlers up a level

okjodom · Apr 27, 2024 · 27684cf · 27684cf
1 parent 20615bd
commit 27684cf
Show file tree

Hide file tree

Showing 15 changed files with 186 additions and 197 deletions.
diff --git a/clientd-stateless/examples/cashu_encoding.rs b/clientd-stateless/examples/cashu_encoding.rs
diff --git a/clientd-stateless/src/main.rs b/clientd-stateless/src/main.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;
 use anyhow::Result;
 use axum::http::Method;
 use fedimint_core::api::InviteCode;
-use router::handlers;
+use router::{check, info, keys, keysets, melt, mint, swap};
 use tower_http::cors::{Any, CorsLayer};
 use tower_http::trace::TraceLayer;
 use tracing::info;
@@ -156,31 +156,22 @@ async fn main() -> Result<()> {
 /// - DLEQ in BlindedSignature for Mint to User
 fn cashu_v1_rest() -> Router<AppState> {
     Router::new()
-        .route("/keys", get(handlers::keys::handle_keys))
-        .route(
-            "/keys/:keyset_id",
-            get(handlers::keys::handle_keys_keyset_id),
-        )
-        .route("/keysets", get(handlers::keysets::handle_keysets))
-        .route("/swap", post(handlers::swap::handle_swap))
-        .route(
-            "/mint/quote/:method",
-            get(handlers::mint::quote::handle_method),
-        )
+        .route("/keys", get(keys::handle_keys))
+        .route("/keys/:keyset_id", get(keys::handle_keys_keyset_id))
+        .route("/keysets", get(keysets::handle_keysets))
+        .route("/swap", post(swap::handle_swap))
+        .route("/mint/quote/:method", get(mint::quote::handle_method))
         .route(
             "/mint/quote/:method/:quote_id",
-            get(handlers::mint::quote::handle_method_quote_id),
-        )
-        .route("/mint/:method", post(handlers::mint::method::handle_method))
-        .route(
-            "/melt/quote/:method",
-            get(handlers::melt::quote::handle_method),
+            get(mint::quote::handle_method_quote_id),
         )
+        .route("/mint/:method", post(mint::method::handle_method))
+        .route("/melt/quote/:method", get(melt::quote::handle_method))
         .route(
             "/melt/quote/:method/:quote_id",
-            get(handlers::melt::quote::handle_method_quote_id),
+            get(melt::quote::handle_method_quote_id),
         )
-        .route("/melt/:method", post(handlers::melt::method::handle_method))
-        .route("/info", get(handlers::info::handle_info))
-        .route("/check", post(handlers::check::handle_check))
+        .route("/melt/:method", post(melt::method::handle_method))
+        .route("/info", get(info::handle_info))
+        .route("/check", post(check::handle_check))
 }
diff --git a/...td-stateless/src/router/handlers/check.rs → clientd-stateless/src/router/check.rs b/...td-stateless/src/router/handlers/check.rs → clientd-stateless/src/router/check.rs
diff --git a/clientd-stateless/src/router/handlers/mod.rs b/clientd-stateless/src/router/handlers/mod.rs
diff --git a/...ntd-stateless/src/router/handlers/info.rs → clientd-stateless/src/router/info.rs b/...ntd-stateless/src/router/handlers/info.rs → clientd-stateless/src/router/info.rs
diff --git a/...ntd-stateless/src/router/handlers/keys.rs → clientd-stateless/src/router/keys.rs b/...ntd-stateless/src/router/handlers/keys.rs → clientd-stateless/src/router/keys.rs
diff --git a/...-stateless/src/router/handlers/keysets.rs → clientd-stateless/src/router/keysets.rs b/...-stateless/src/router/handlers/keysets.rs → clientd-stateless/src/router/keysets.rs
diff --git a/...teless/src/router/handlers/melt/method.rs → clientd-stateless/src/router/melt/method.rs b/...teless/src/router/handlers/melt/method.rs → clientd-stateless/src/router/melt/method.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 use tracing::{error, info};
 
 use crate::error::AppError;
-use crate::router::handlers::{Method, Unit};
+use crate::router::{Method, Unit};
 use crate::state::AppState;
 
 #[derive(Debug, Deserialize)]

diff --git a/...stateless/src/router/handlers/melt/mod.rs → clientd-stateless/src/router/melt/mod.rs b/...stateless/src/router/handlers/melt/mod.rs → clientd-stateless/src/router/melt/mod.rs
diff --git a/...ateless/src/router/handlers/melt/quote.rs → clientd-stateless/src/router/melt/quote.rs b/...ateless/src/router/handlers/melt/quote.rs → clientd-stateless/src/router/melt/quote.rs
diff --git a/...teless/src/router/handlers/mint/method.rs → clientd-stateless/src/router/mint/method.rs b/...teless/src/router/handlers/mint/method.rs → clientd-stateless/src/router/mint/method.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 use tracing::error;
 
 use crate::error::AppError;
-use crate::router::handlers::{Method, Unit};
+use crate::router::{Method, Unit};
 use crate::state::AppState;
 
 #[derive(Debug, Deserialize)]

diff --git a/...stateless/src/router/handlers/mint/mod.rs → clientd-stateless/src/router/mint/mod.rs b/...stateless/src/router/handlers/mint/mod.rs → clientd-stateless/src/router/mint/mod.rs
diff --git a/...ateless/src/router/handlers/mint/quote.rs → clientd-stateless/src/router/mint/quote.rs b/...ateless/src/router/handlers/mint/quote.rs → clientd-stateless/src/router/mint/quote.rs