Add exit mixnet and replace whitespaces

nymtech · Sep 12, 2024 · 8d5192d · 8d5192d
1 parent 30611fc
commit 8d5192d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/common/gateway-storage/migrations/20240910120000_generic_client_id.sql b/common/gateway-storage/migrations/20240910120000_generic_client_id.sql
@@ -5,11 +5,11 @@
 
 CREATE TABLE clients (
    id              INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-   client_type     TEXT NOT NULL CHECK(client_type IN ('entry mixnet', 'entry wireguard', 'exit wireguard'))
+   client_type     TEXT NOT NULL CHECK(client_type IN ('entry_mixnet', 'exit_mixnet', 'entry_wireguard', 'exit_wireguard'))
 );
 
 INSERT INTO clients (id, client_type)
-SELECT id, 'entry mixnet'
+SELECT id, 'entry_mixnet'
 FROM shared_keys;
 
 CREATE TABLE shared_keys_tmp (

diff --git a/common/gateway-storage/src/clients.rs b/common/gateway-storage/src/clients.rs
@@ -9,6 +9,7 @@ use crate::models::Client;
 #[sqlx(type_name = "TEXT")] // SQLite TEXT type
 pub enum ClientType {
     EntryMixnet,
+    ExitMixnet,
     EntryWireguard,
     ExitWireguard,
 }
@@ -18,9 +19,10 @@ impl FromStr for ClientType {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "entry mixnet" => Ok(ClientType::EntryMixnet),
-            "entry wireguard" => Ok(ClientType::EntryWireguard),
-            "exit wireguard" => Ok(ClientType::ExitWireguard),
+            "entry_mixnet" => Ok(ClientType::EntryMixnet),
+            "exit_mixnet" => Ok(ClientType::ExitMixnet),
+            "entry_wireguard" => Ok(ClientType::EntryWireguard),
+            "exit_wireguard" => Ok(ClientType::ExitWireguard),
             _ => Err("Invalid client type"),
         }
     }
@@ -29,9 +31,10 @@ impl FromStr for ClientType {
 impl std::fmt::Display for ClientType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let s = match self {
-            ClientType::EntryMixnet => "entry mixnet",
-            ClientType::EntryWireguard => "entry wireguard",
-            ClientType::ExitWireguard => "exit wireguard",
+            ClientType::EntryMixnet => "entry_mixnet",
+            ClientType::ExitMixnet => "exit_mixnet",
+            ClientType::EntryWireguard => "entry_wireguard",
+            ClientType::ExitWireguard => "exit_wireguard",
         };
         write!(f, "{}", s)
     }