Feature/gateway provider merge

Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "clients/desktop",
     "clients/webassembly",
     "common/client-libs/directory-client",
+    "common/client-libs/gateway-client",
     "common/client-libs/mix-client",
     "common/client-libs/multi-tcp-client",
     "common/client-libs/provider-client",
@@ -19,6 +20,7 @@ members = [
     "common/pemstore",
     "common/topology",
     "gateway",
+    "gateway/gateway-requests",
     "mixnode",
     "sfw-provider",
     "sfw-provider/sfw-provider-requests",

clients/desktop/Cargo.toml

@@ -26,18 +26,20 @@ serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.44"
 tokio = { version = "0.2", features = ["full"] }
 tokio-tungstenite = "0.10.1"
+url = "2.1"
 
 ## internal
 config = {path = "../../common/config"}
 crypto = {path = "../../common/crypto"}
 directory-client = { path = "../../common/client-libs/directory-client" }
+gateway-client = { path = "../../common/client-libs/gateway-client" }
+gateway-requests = { path = "../../gateway/gateway-requests" }
 healthcheck = { path = "../../common/healthcheck" }
 mix-client = { path = "../../common/client-libs/mix-client" }
 multi-tcp-client = { path = "../../common/client-libs/multi-tcp-client" }
 nymsphinx = { path = "../../common/nymsphinx" }
 pemstore = {path = "../../common/pemstore"}
 provider-client = { path = "../../common/client-libs/provider-client" }
-sfw-provider-requests = { path = "../../sfw-provider/sfw-provider-requests" }
 topology = {path = "../../common/topology" }
 
 [build-dependencies]

clients/desktop/src/client/mix_traffic.rs

@@ -14,10 +14,10 @@
 
 use futures::channel::mpsc;
 use futures::StreamExt;
+use gateway_client::GatewayClient;
 use log::*;
 use nymsphinx::SphinxPacket;
 use std::net::SocketAddr;
-use std::time::Duration;
 use tokio::runtime::Handle;
 use tokio::task::JoinHandle;
 
@@ -31,37 +31,40 @@ impl MixMessage {
     }
 }
 
-pub(crate) struct MixTrafficController {
-    tcp_client: multi_tcp_client::Client,
+pub(crate) struct MixTrafficController<'a> {
+    // TODO: most likely to be replaced by some higher level construct as
+    // later on gateway_client will need to be accessible by other entities
+    gateway_client: GatewayClient<'a, url::Url>,
     mix_rx: MixMessageReceiver,
 }
 
-impl MixTrafficController {
+impl<'a> MixTrafficController<'static> {
     pub(crate) fn new(
-        initial_reconnection_backoff: Duration,
-        maximum_reconnection_backoff: Duration,
-        initial_connection_timeout: Duration,
         mix_rx: MixMessageReceiver,
-    ) -> Self {
-        let tcp_client_config = multi_tcp_client::Config::new(
-            initial_reconnection_backoff,
-            maximum_reconnection_backoff,
-            initial_connection_timeout,
-        );
-
+        gateway_client: GatewayClient<'a, url::Url>,
+    ) -> MixTrafficController<'a> {
         MixTrafficController {
-            tcp_client: multi_tcp_client::Client::new(tcp_client_config),
+            gateway_client,
             mix_rx,
         }
     }
 
     async fn on_message(&mut self, mix_message: MixMessage) {
         debug!("Got a mix_message for {:?}", mix_message.0);
-        self.tcp_client
-            // TODO: possibly we might want to get an actual result here at some point
-            .send(mix_message.0, mix_message.1.to_bytes(), false)
+        match self
+            .gateway_client
+            .send_sphinx_packet(mix_message.0, mix_message.1.to_bytes())
             .await
-            .unwrap(); // if we're not waiting for response, we MUST get an Ok
+        {
+            Err(e) => error!("Failed to send sphinx packet to the gateway! - {:?}", e),
+            Ok(was_successful) if !was_successful => {
+                warn!("Sent sphinx packet to the gateway but it failed to get processed!")
+            }
+            Ok(was_successful) if was_successful => {
+                trace!("Successfully forwarded sphinx packet to the gateway!")
+            }
+            Ok(_) => unreachable!("to shut up the compiler because all patterns ARE covered"),
+        }
     }
 
     pub(crate) async fn run(&mut self) {