Rename talpid-relay-config-client to talpid-tunnel-config-client

10 files changed, 19 insertions, 19 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 758ca19a76..5ef4205b00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3339,8 +3339,8 @@ dependencies = [
  "system-configuration",
  "talpid-dbus",
  "talpid-platform-metadata",
- "talpid-relay-config-client",
  "talpid-time",
+ "talpid-tunnel-config-client",
  "talpid-types",
  "tempfile",
  "tokio",
@@ -3400,7 +3400,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "talpid-relay-config-client"
+name = "talpid-time"
+version = "0.1.0"
+dependencies = [
+ "libc",
+ "tokio",
+]
+
+[[package]]
+name = "talpid-tunnel-config-client"
 version = "0.1.0"
 dependencies = [
  "classic-mceliece-rust",
@@ -3416,14 +3424,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "talpid-time"
-version = "0.1.0"
-dependencies = [
- "libc",
- "tokio",
-]
-
-[[package]]
 name = "talpid-types"
 version = "0.1.0"
 dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 894abb4cb6..209384de44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,8 @@ members = [
     "talpid-core",
     "talpid-dbus",
     "talpid-platform-metadata",
-    "talpid-relay-config-client",
     "talpid-time",
+    "talpid-tunnel-config-client",
     "mullvad-management-interface",
     "tunnel-obfuscation",
 ]
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index dbaae6a323..b6ff02bd8c 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -26,7 +26,7 @@ regex = "1.1.0"
 shell-escape = "0.1"
 talpid-types = { path = "../talpid-types" }
 talpid-time = { path = "../talpid-time" }
-talpid-relay-config-client = { path = "../talpid-relay-config-client" }
+talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }
 uuid = { version = "0.8", features = ["v4"] }
 zeroize = "1"
 chrono = "0.4.19"
diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs
index b8c1f1bd4c..7b3d2a4aa4 100644
--- a/talpid-core/src/tunnel/wireguard/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/mod.rs
@@ -81,7 +81,7 @@ pub enum Error {
 
     /// Failed to negotiate PQ PSK
     #[error(display = "Failed to negotiate PQ PSK")]
-    PskNegotiationError(#[error(source)] talpid_relay_config_client::Error),
+    PskNegotiationError(#[error(source)] talpid_tunnel_config_client::Error),
 
     /// Failed to set up IP interfaces.
     #[cfg(windows)]
@@ -338,7 +338,7 @@ impl WireguardMonitor {
 
                 let (private_key, psk) = tokio::time::timeout(
                     timeout,
-                    talpid_relay_config_client::push_pq_key(
+                    talpid_tunnel_config_client::push_pq_key(
                         IpAddr::V4(config.ipv4_gateway),
                         config.tunnel.private_key.public_key(),
                     ),
diff --git a/talpid-relay-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml
index a94a0d576a..5cb8983c41 100644
--- a/talpid-relay-config-client/Cargo.toml
+++ b/talpid-tunnel-config-client/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "talpid-relay-config-client"
+name = "talpid-tunnel-config-client"
 version = "0.1.0"
 authors = ["Mullvad VPN"]
-description = "Uses relays to set up PQ-safe peers, etc."
+description = "Uses the relay RPC service to set up PQ-safe peers, etc."
 license = "GPL-3.0"
 edition = "2021"
 publish = false
diff --git a/talpid-relay-config-client/build.rs b/talpid-tunnel-config-client/build.rs
index 2732fb69d0..2732fb69d0 100644
--- a/talpid-relay-config-client/build.rs
+++ b/talpid-tunnel-config-client/build.rs
diff --git a/talpid-relay-config-client/examples/psk-exchange.rs b/talpid-tunnel-config-client/examples/psk-exchange.rs
index 51cb138e53..b4607be950 100644
--- a/talpid-relay-config-client/examples/psk-exchange.rs
+++ b/talpid-tunnel-config-client/examples/psk-exchange.rs
@@ -16,7 +16,7 @@ async fn main() {
     let pubkey = PublicKey::from_base64(pubkey_s.trim()).expect("Invalid public key");
 
     let (private_key, psk) =
-        talpid_relay_config_client::push_pq_key(IpAddr::V4(Ipv4Addr::new(10, 64, 0, 1)), pubkey)
+        talpid_tunnel_config_client::push_pq_key(IpAddr::V4(Ipv4Addr::new(10, 64, 0, 1)), pubkey)
             .await
             .unwrap();
 
diff --git a/talpid-relay-config-client/proto/tunnel_config.proto b/talpid-tunnel-config-client/proto/tunnel_config.proto
index 9ce4232d0d..9ce4232d0d 100644
--- a/talpid-relay-config-client/proto/tunnel_config.proto
+++ b/talpid-tunnel-config-client/proto/tunnel_config.proto
diff --git a/talpid-relay-config-client/src/kem.rs b/talpid-tunnel-config-client/src/kem.rs
index 35679ccddf..35679ccddf 100644
--- a/talpid-relay-config-client/src/kem.rs
+++ b/talpid-tunnel-config-client/src/kem.rs
diff --git a/talpid-relay-config-client/src/lib.rs b/talpid-tunnel-config-client/src/lib.rs
index 5dd3a1bdab..fafb95affb 100644
--- a/talpid-relay-config-client/src/lib.rs
+++ b/talpid-tunnel-config-client/src/lib.rs
@@ -68,13 +68,13 @@ pub async fn push_pq_key(
         .await
         .map_err(Error::GrpcError)?;
 
-    let ct: [u8; kem::CRYPTO_CIPHERTEXTBYTES] = response
+    let ciphertext: [u8; kem::CRYPTO_CIPHERTEXTBYTES] = response
         .into_inner()
         .ciphertext
         .try_into()
         .map_err(|_| Error::InvalidCiphertext)?;
 
-    Ok((wg_psk_privkey, kem::decapsulate(&kem_secret, &ct)?))
+    Ok((wg_psk_privkey, kem::decapsulate(&kem_secret, &ciphertext)?))
 }
 
 async fn new_client(addr: IpAddr) -> Result<RelayConfigService, Error> {