Moved directory client to separate crate

mixnode/src/node/metrics.rs

@@ -1,10 +1,9 @@
+use directory_client::metrics::MixMetric;
+use directory_client::requests::metrics_mixes_post::MetricsMixPoster;
+use directory_client::DirectoryClient;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 use futures::StreamExt;
-use nym_client::clients::directory;
-use nym_client::clients::directory::metrics::MixMetric;
-use nym_client::clients::directory::requests::metrics_mixes_post::MetricsMixPoster;
-use nym_client::clients::directory::DirectoryClient;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
@@ -72,11 +71,11 @@ impl MetricsReporter {
 
     pub(crate) async fn run_metrics_sender(
         metrics: Arc<Mutex<MetricsReporter>>,
-        cfg: directory::Config,
+        cfg: directory_client::Config,
         pub_key_str: String,
     ) {
         let delay_duration = Duration::from_secs(METRICS_INTERVAL);
-        let directory_client = directory::Client::new(cfg);
+        let directory_client = directory_client::Client::new(cfg);
         loop {
             tokio::time::delay_for(delay_duration).await;
             let (received, sent) =

mixnode/src/node/mod.rs

@@ -1,7 +1,10 @@
+use crate::mix_peer::MixPeer;
+use crate::node::metrics::MetricsReporter;
 use curve25519_dalek::montgomery::MontgomeryPoint;
 use curve25519_dalek::scalar::Scalar;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
+use futures::SinkExt;
 use sphinx::header::delays::Delay as SphinxDelay;
 use sphinx::{ProcessedPacket, SphinxPacket};
 use std::net::SocketAddr;
@@ -10,12 +13,6 @@ use std::time::Duration;
 use tokio::prelude::*;
 use tokio::runtime::Runtime;
 
-use crate::mix_peer;
-use crate::mix_peer::MixPeer;
-use crate::node::metrics::MetricsReporter;
-use futures::SinkExt;
-use nym_client::clients::directory;
-
 mod metrics;
 mod presence;
 pub mod runner;
@@ -225,7 +222,7 @@ impl MixNode {
         let (received_tx, received_rx) = mpsc::channel(1024);
         let (sent_tx, sent_rx) = mpsc::channel(1024);
 
-        let directory_cfg = directory::Config {
+        let directory_cfg = directory_client::Config {
             base_url: self.directory_server.clone(),
         };
         let pub_key_str =

mixnode/src/node/presence.rs

@@ -1,22 +1,21 @@
 use crate::node;
-use nym_client::clients::directory;
-use nym_client::clients::directory::presence::MixNodePresence;
-use nym_client::clients::directory::requests::presence_mixnodes_post::PresenceMixNodesPoster;
-use nym_client::clients::directory::DirectoryClient;
+use directory_client::presence::MixNodePresence;
+use directory_client::requests::presence_mixnodes_post::PresenceMixNodesPoster;
+use directory_client::DirectoryClient;
 use std::thread;
 use std::time::Duration;
 
 pub struct Notifier {
-    pub net_client: directory::Client,
+    pub net_client: directory_client::Client,
     presence: MixNodePresence,
 }
 
 impl Notifier {
     pub fn new(node_config: &node::Config) -> Notifier {
-        let config = directory::Config {
+        let config = directory_client::Config {
             base_url: node_config.directory_server.clone(),
         };
-        let net_client = directory::Client::new(config);
+        let net_client = directory_client::Client::new(config);
         let presence = MixNodePresence {
             host: node_config.socket_address.to_string(), // note: the directory server determines the real incoming IP itself, but uses the socket. Host here is just a placeholder.
             pub_key: node_config.public_key_string(),