Skip to content

Commit e866f4d

Browse files
committed
Cargo - remove hyper & regex from deps
- use hyper only for dev-deps - replace all possible use statements of hyper with axum
1 parent a921c1c commit e866f4d

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sentry/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ axum-server = { version = "0.4", features = ["tls-rustls"] }
4646
tower = "0.4"
4747
tower-http = { version = "0.3", features = ["cors"] }
4848
tokio = { version = "1", features = ["macros", "time", "rt-multi-thread", "signal"] }
49-
hyper = { version = "0.14", features = ["stream", "runtime", "http1", "http2", "server"] }
50-
regex = "1"
49+
5150
# Database
5251
redis = { version = "0.21", features = ["aio", "tokio-comp"] }
5352
deadpool = "0.9"
@@ -84,3 +83,6 @@ pretty_assertions = "1"
8483

8584
primitives = { path = "../primitives", features = ["postgres", "test-util"] }
8685
adapter = { version = "0.2", path = "../adapter", features = ["test-util"] }
86+
87+
# we only require `hyper` for `hyper::body::to_bytes` function
88+
hyper = { version = "0.14", default-features = false }

sentry/src/middleware/auth.rs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
use std::sync::Arc;
22

3-
use axum::middleware::Next;
4-
use hyper::{
5-
header::{AUTHORIZATION, REFERER},
6-
Request,
3+
use axum::{
4+
http::{
5+
header::{AUTHORIZATION, REFERER},
6+
Request,
7+
},
8+
middleware::Next,
79
};
810

911
use adapter::{prelude::*, primitives::Session as AdapterSession};
@@ -193,16 +195,21 @@ fn get_request_ip<B>(req: &Request<B>) -> Option<String> {
193195
mod test {
194196
use std::collections::HashMap;
195197

198+
use axum::{
199+
body::Body,
200+
http::{Request, StatusCode},
201+
middleware::from_fn,
202+
routing::get,
203+
Extension, Router,
204+
};
205+
use tower::Service;
206+
196207
use adapter::{
197208
dummy::{Dummy, HeaderToken},
198209
ethereum::test_util::GANACHE_1,
199210
};
200-
use axum::{body::Body, middleware::from_fn, routing::get, Extension, Router};
201-
use hyper::{Request, StatusCode};
202211
use primitives::test_util::{DUMMY_AUTH, LEADER};
203212

204-
use tower::Service;
205-
206213
use crate::{middleware::body_to_string, test_util::setup_dummy_app, Session};
207214

208215
use super::*;

sentry/src/routes/routers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
use std::sync::Arc;
1616

1717
use axum::{
18+
http::Request,
1819
middleware::{self, Next},
1920
routing::{get, post},
2021
Extension, Router,
2122
};
22-
use hyper::Request;
23-
use primitives::analytics::query::ALLOWED_KEYS;
2423
use tower::ServiceBuilder;
2524

2625
use adapter::{prelude::*, Adapter, Dummy};
26+
use primitives::analytics::query::ALLOWED_KEYS;
2727

2828
use crate::{
2929
middleware::{

0 commit comments

Comments
 (0)