From 0b2ab63d1cc23a7d4317ba0d90f47a06500882a5 Mon Sep 17 00:00:00 2001
From: Belousov Maksim <lib.bmw@gmail.com>
Date: Mon, 21 Aug 2023 03:13:03 +0400
Subject: [PATCH] chore(htiboxd): remove hitbox-backend dependency

---
 hitboxd/Cargo.toml     |  1 -
 hitboxd/src/layer.rs   |  4 +---
 hitboxd/src/main.rs    | 10 +++++-----
 hitboxd/src/service.rs |  5 +----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/hitboxd/Cargo.toml b/hitboxd/Cargo.toml
index 679bb7e..62f194d 100644
--- 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
index 801fe74..62e8739 100644
--- 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
index fdc55fe..a9cc554 100644
--- 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
index 5bb4310..4f6e83f 100644
--- 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> {