From 7a8e80f4b2095b539402efe5a1762d0ce20006f4 Mon Sep 17 00:00:00 2001
From: sjaanus <sellinjaanus@gmail.com>
Date: Thu, 16 Jan 2025 13:53:26 +0200
Subject: [PATCH] chore: remove compiler flag for delta

---
 server/Cargo.toml                              | 3 ---
 server/src/cli.rs                              | 4 ++--
 server/src/http/refresher/delta_refresher.rs   | 2 --
 server/src/http/refresher/feature_refresher.rs | 6 +++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 0d4b650b..e51e433a 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -117,6 +117,3 @@ tracing-test = "0.2.5"
 
 [build-dependencies]
 shadow-rs = "0.37.0"
-
-[features]
-delta = []
diff --git a/server/src/cli.rs b/server/src/cli.rs
index 693d4999..649a63b0 100644
--- a/server/src/cli.rs
+++ b/server/src/cli.rs
@@ -221,8 +221,8 @@ pub struct EdgeArgs {
     #[clap(long, env, default_value_t = false, requires = "strict")]
     pub delta: bool,
 
-    /// If set to true, it compares features payload with delta payload and logs diff. This is experimental feature and might change. Requires strict mode
-    #[clap(long, env, default_value_t = false, requires = "strict")]
+    /// If set to true, it compares features payload with delta payload and logs diff. This is experimental feature and might change.
+    #[clap(long, env, default_value_t = false, conflicts_with = "delta")]
     pub delta_diff: bool,
 
     /// Sets a remote write url for prometheus metrics, if this is set, prometheus metrics will be written upstream
diff --git a/server/src/http/refresher/delta_refresher.rs b/server/src/http/refresher/delta_refresher.rs
index 35fbb7f6..4fb369f2 100644
--- a/server/src/http/refresher/delta_refresher.rs
+++ b/server/src/http/refresher/delta_refresher.rs
@@ -113,8 +113,6 @@ impl FeatureRefresher {
     }
 }
 
-
-#[cfg(feature = "delta")]
 #[cfg(test)]
 mod tests {
     use actix_http::header::IF_NONE_MATCH;
diff --git a/server/src/http/refresher/feature_refresher.rs b/server/src/http/refresher/feature_refresher.rs
index 1a512b6a..868aab52 100644
--- a/server/src/http/refresher/feature_refresher.rs
+++ b/server/src/http/refresher/feature_refresher.rs
@@ -451,7 +451,7 @@ impl FeatureRefresher {
     pub async fn hydrate_new_tokens(&self) {
         let hydrations = self.get_tokens_never_refreshed();
         for hydration in hydrations {
-            if cfg!(feature = "delta") && self.delta {
+            if self.delta {
                 self.refresh_single_delta(hydration).await;
             } else {
                 self.refresh_single(hydration).await;
@@ -461,7 +461,7 @@ impl FeatureRefresher {
     pub async fn refresh_features(&self) {
         let refreshes = self.get_tokens_due_for_refresh();
         for refresh in refreshes {
-            if cfg!(feature = "delta") && self.delta {
+            if self.delta {
                 self.refresh_single_delta(refresh).await;
             } else {
                 self.refresh_single(refresh).await;
@@ -522,7 +522,7 @@ impl FeatureRefresher {
                 ClientFeaturesResponse::Updated(features, etag) => {
                     self.handle_client_features_updated(&refresh.token, features, etag)
                         .await;
-                    if cfg!(feature = "delta") && self.delta_diff {
+                    if self.delta_diff {
                         self.compare_delta_cache(&refresh).await;
                     }
                 }