Remove hack

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 #####

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 #####

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(),