chore(htiboxd): remove hitbox-backend dependency

hit-box · Aug 20, 2023 · 0b2ab63 · 0b2ab63
1 parent 2b19b14
commit 0b2ab63
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/hitboxd/Cargo.toml b/hitboxd/Cargo.toml
@@ -11,7 +11,6 @@ hitbox = { path = "../../hitbox/hitbox", features = ["metrics"] }
 hitbox-tower = { path = "../../hitbox/hitbox-tower" }
 hitbox-http = { path = "../../hitbox/hitbox-http", version = "0.1" }
 hitbox-redis = { path = "../../hitbox/hitbox-redis", version = "0.1" }
-hitbox-backend = { path = "../../hitbox/hitbox-backend", version = "0.1" }
 actix-router = "0.5"
 hyper = { version = "0.14", features = ["full"] }
 tokio = { version = "1", features = ["full"] }

diff --git a/hitboxd/src/layer.rs b/hitboxd/src/layer.rs
@@ -1,8 +1,6 @@
 use std::collections::HashMap;
-use std::{marker::PhantomData, sync::Arc};
+use std::sync::Arc;
 
-use hitbox::backend::CacheBackend;
-use hitbox_redis::RedisBackend;
 use tower::Layer;
 
 use crate::CacheService;

diff --git a/hitboxd/src/main.rs b/hitboxd/src/main.rs
@@ -1,15 +1,15 @@
 use hitbox::{predicate::Predicate, Extractor};
 use hitbox_http::{
     extractors::{method::MethodExtractor, path::PathExtractor, NeutralExtractor},
-    predicates::{header::HeaderPredicate, query::QueryPredicate, NeutralRequestPredicate},
+    predicates::{
+        request::{HeaderPredicate, QueryPredicate},
+        NeutralRequestPredicate,
+    },
     CacheableHttpRequest,
 };
 use hitbox_redis::RedisBackend;
 // use hitbox_stretto::StrettoBackend;
-use hitboxd::{
-    config::{BoxPredicate, Endpoint},
-    Cache,
-};
+use hitboxd::{config::Endpoint, Cache};
 use http::Method;
 use hyper::{Body, Server};
 use std::{collections::HashMap, net::SocketAddr, sync::Arc};

diff --git a/hitboxd/src/service.rs b/hitboxd/src/service.rs
@@ -5,15 +5,12 @@ use actix_router::ResourceDef;
 use hitbox::policy::PolicyConfig;
 use hitbox::{backend::CacheBackend, fsm::CacheFuture};
 use hitbox_http::{
-    predicates::{query::QueryPredicate, NeutralRequestPredicate, NeutralResponsePredicate},
-    CacheableHttpRequest, CacheableHttpResponse, FromBytes,
+    predicates::NeutralResponsePredicate, CacheableHttpRequest, CacheableHttpResponse, FromBytes,
 };
 use http::{Request, Response};
 use hyper::body::{Body, HttpBody};
 use tower::Service;
 
-use tracing::log::warn;
-
 use hitbox_tower::future::Transformer;
 
 pub struct CacheService<S, B> {