Pulled nym-client binary out to top-level

Cargo.toml

@@ -1,15 +1,15 @@
 [workspace]
 
 members = [
-    "clients/nym-client",
-    "clients/directory-client",
-    "clients/mix-client",
-    "clients/provider-client",
-    "clients/validator-client",
+    "common/clients/directory-client",
+    "common/clients/mix-client",
+    "common/clients/provider-client",
+    "common/clients/validator-client",
     "common/addressing",
     "common/crypto",
     "common/topology",
     "mixnode",
+    "nym-client",
     "sfw-provider",
     "sfw-provider/sfw-provider-requests",
     "validator",

common/clients/directory-client/Cargo.toml

@@ -11,7 +11,7 @@ reqwest = "0.9.22"
 serde = { version = "1.0.104", features = ["derive"] }
 
 ## internal
-topology = {path = "../../common/topology"}
+topology = {path = "../../topology"}
 
 [dev-dependencies]
 mockito = "0.22.0"

common/clients/provider-client/Cargo.toml

@@ -12,7 +12,7 @@ log = "0.4.8"
 tokio = { version = "0.2", features = ["full"] }
 
 ## internal
-sfw-provider-requests = { path = "../../sfw-provider/sfw-provider-requests" }
+sfw-provider-requests = { path = "../../../sfw-provider/sfw-provider-requests" }
 
 ## will be moved to proper dependencies once released
 sphinx = { git = "https://github.com/nymtech/sphinx", rev="1d8cefcb6a0cb8e87d00d89eb1ccf2839e92aa1f" }

common/crypto/src/identity/mod.rs

@@ -103,6 +103,7 @@ impl DummyMixIdentityPublicKey {
         base64::encode_config(&self.to_bytes(), base64::URL_SAFE)
     }
 
+    #[allow(dead_code)]
     fn from_b64_string(val: String) -> Self {
         Self::from_bytes(&base64::decode_config(&val, base64::URL_SAFE).unwrap())
     }

mixnode/Cargo.toml

@@ -16,7 +16,7 @@ tokio = { version = "0.2", features = ["full"] }
 
 ## internal
 addressing = {path = "../common/addressing" }
-directory-client = { path = "../clients/directory-client" }
+directory-client = { path = "../common/clients/directory-client" }
 
 ## will be moved to proper dependencies once released
 sphinx = { git = "https://github.com/nymtech/sphinx", rev="1d8cefcb6a0cb8e87d00d89eb1ccf2839e92aa1f" }

nym-client/Cargo.toml

@@ -30,13 +30,13 @@ tokio = { version = "0.2", features = ["full"] }
 tungstenite = "0.9.2"
 
 ## internal
-addressing = {path = "../../common/addressing" }
-crypto = {path = "../../common/crypto"}
-directory-client = { path = "../directory-client" }
-mix-client = { path = "../mix-client" }
-provider-client = { path = "../provider-client" }
-sfw-provider-requests = { path = "../../sfw-provider/sfw-provider-requests" }
-topology = {path = "../../common/topology" }
+addressing = {path = "../common/addressing" }
+crypto = {path = "../common/crypto"}
+directory-client = { path = "../common/clients/directory-client" }
+mix-client = { path = "../common/clients/mix-client" }
+provider-client = { path = "../common/clients/provider-client" }
+sfw-provider-requests = { path = "../sfw-provider/sfw-provider-requests" }
+topology = {path = "../common/topology" }
 
 ## will be moved to proper dependencies once released
 sphinx = { git = "https://github.com/nymtech/sphinx", rev="1d8cefcb6a0cb8e87d00d89eb1ccf2839e92aa1f" }

nym-client/src/persistence/pemstore.rs

@@ -13,6 +13,7 @@ pub fn read_mix_identity_keypair_from_disk(
     keypair
 }
 
+#[allow(dead_code)]
 pub fn read_mix_encryption_keypair_from_disk(_id: String) -> crypto::encryption::x25519::KeyPair {
     unimplemented!()
 }

sfw-provider/Cargo.toml

@@ -22,7 +22,7 @@ hmac = "0.7.1"
 
 ## internal
 crypto = {path = "../common/crypto"}
-directory-client = { path = "../clients/directory-client" }
+directory-client = { path = "../common/clients/directory-client" }
 sfw-provider-requests = { path = "./sfw-provider-requests" }
 
 ## will be moved to proper dependencies once released

validator/Cargo.toml

@@ -23,9 +23,9 @@ toml = "0.5.5"
 ## internal
 addressing = {path = "../common/addressing" }
 crypto = { path = "../common/crypto" }
-directory-client = { path = "../clients/directory-client" }
-mix-client = { path = "../clients/mix-client" }
-provider-client = { path = "../clients/provider-client" }
+directory-client = { path = "../common/clients/directory-client" }
+mix-client = { path = "../common/clients/mix-client" }
+provider-client = { path = "../common/clients/provider-client" }
 sfw-provider-requests = { path = "../sfw-provider/sfw-provider-requests" }
 topology = {path = "../common/topology" }
 
@@ -36,4 +36,3 @@ sphinx = { git = "https://github.com/nymtech/sphinx", rev="1d8cefcb6a0cb8e87d00d
 built = "0.3.2"
 
 [dev-dependencies]
-