Refactor server from warp into axum

nimiq · Jan 22, 2025 · c8cbf5a · c8cbf5a
1 parent 251db16
commit c8cbf5a
Show file tree

Hide file tree

Showing 3 changed files with 123 additions and 150 deletions.
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -11,26 +11,25 @@ categories.workspace = true
 keywords.workspace = true
 
 [dependencies]
+axum = { version = "0.8", features = ["ws"] }
+axum-extra = { version = "0.10", features = ["typed-header"] }
 async-trait = "0.1"
 blake2 = "0.10"
-bytes = "1.4"
 futures = "0.3"
-headers = "0.3"
-http = "0.2"
 log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 subtle = "2.5"
 thiserror = "1.0"
-tokio = { version = "1.25", features = ["sync"] }
-warp =  "0.3"
+tokio = { version = "1.43", features = ["sync"] }
+tower-http = { version = "0.6", features = ["auth", "cors"] }
 
 nimiq-jsonrpc-core = { workspace = true }
 
 [dev-dependencies]
 anyhow = "1.0"
-pretty_env_logger = "0.5.0"
-tokio = { version = "1.25", features = ["macros", "rt-multi-thread"] }
+pretty_env_logger = "0.5"
+tokio = { version = "1.43", features = ["macros", "rt-multi-thread"] }
 
 nimiq-jsonrpc-client = { workspace = true }
 nimiq-jsonrpc-derive = { workspace = true }
diff --git a/server/src/auth_filter.rs b/server/src/auth_filter.rs