From 65d93b2b1803b2454fd07f17e05e699d7cbfd844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Fri, 27 Oct 2023 10:54:53 +0200
Subject: [PATCH] Remove hack

---
 gateway/src/commands/init.rs | 2 +-
 gateway/src/commands/run.rs  | 2 +-
 gateway/src/node/mod.rs      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gateway/src/commands/init.rs b/gateway/src/commands/init.rs
index 296e7c8017..286a24f21a 100644
--- a/gateway/src/commands/init.rs
+++ b/gateway/src/commands/init.rs
@@ -86,7 +86,7 @@ pub struct Init {
     with_network_requester: bool,
 
     /// Allows this gateway to run an embedded network requester for minimal network overhead
-    #[clap(long, conflicts_with = "with_network_requester")]
+    #[clap(long, hide = true, conflicts_with = "with_network_requester")]
     with_ip_forwarder: bool,
 
     // ##### NETWORK REQUESTER FLAGS #####
diff --git a/gateway/src/commands/run.rs b/gateway/src/commands/run.rs
index ad6a4495c6..a0f807a99d 100644
--- a/gateway/src/commands/run.rs
+++ b/gateway/src/commands/run.rs
@@ -91,7 +91,7 @@ pub struct Run {
     with_network_requester: Option<bool>,
 
     /// Allows this gateway to run an embedded network requester for minimal network overhead
-    #[arg(long, conflicts_with = "with_network_requester")]
+    #[arg(long, hide = true, conflicts_with = "with_network_requester")]
     with_ip_forwarder: Option<bool>,
 
     // ##### NETWORK REQUESTER FLAGS #####
diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs
index 7bbdd1233c..0be8be5eaf 100644
--- a/gateway/src/node/mod.rs
+++ b/gateway/src/node/mod.rs
@@ -476,9 +476,7 @@ impl<St> Gateway<St> {
             });
         }
 
-        // WIP(JON)
-        // let nr_request_filter = if self.config.network_requester.enabled {
-        let nr_request_filter = if false {
+        let nr_request_filter = if self.config.network_requester.enabled {
             let embedded_nr = self
                 .start_network_requester(
                     mix_forwarding_channel.clone(),
@@ -493,7 +491,9 @@ impl<St> Gateway<St> {
             None
         };
 
-        if true {
+        // NOTE: this is mutually exclusive with the network requester (for now). This is reflected
+        // in the command line arguments as well.
+        if self.config.ip_forwarder.enabled {
             let embedded_ip_sp = self
                 .start_ip_service_provider(
                     mix_forwarding_channel.clone(),