Merge pull request #89 from nightly-labs/refactor

replace individual serde rename to rename all
nightly-labs · Feb 7, 2024 · 1ae8a02 · 1ae8a02
2 parents eee8b4b + 2b53c3f
commit 1ae8a02
Showing 24 changed files with 62 additions and 98 deletions.
diff --git a/server/src/http/connect_session.rs b/server/src/http/connect_session.rs
@@ -9,12 +9,10 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpConnectSessionRequest {
-    #[serde(rename = "clientId")]
     pub client_id: String,
-    #[serde(rename = "publicKeys")]
     pub public_keys: Vec<String>,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
     #[ts(optional)]
     pub notification: Option<Notification>,

diff --git a/server/src/http/drop_sessions.rs b/server/src/http/drop_sessions.rs
@@ -7,16 +7,16 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpDropSessionsRequest {
-    #[serde(rename = "clientId")]
     pub client_id: ClientId,
     pub sessions: Vec<SessionId>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpDropSessionsResponse {
-    #[serde(rename = "droppedSessions")]
     pub dropped_sessions: Vec<SessionId>,
 }
 

diff --git a/server/src/http/get_pending_request.rs b/server/src/http/get_pending_request.rs
@@ -1,21 +1,18 @@
-use axum::{extract::State, http::StatusCode, Json};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
 use crate::{
     errors::NightlyError,
     state::{ClientId, SessionId, Sessions},
     structs::common::PendingRequest,
 };
+use axum::{extract::State, http::StatusCode, Json};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetPendingRequestRequest {
-    #[serde(rename = "clientId")]
     pub client_id: ClientId,
-    #[serde(rename = "sessionId")]
     pub session_id: SessionId,
-    #[serde(rename = "requestId")]
     pub request_id: String,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]

diff --git a/server/src/http/get_pending_requests.rs b/server/src/http/get_pending_requests.rs
@@ -1,26 +1,24 @@
-use axum::{extract::State, http::StatusCode, Json};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
 use crate::{
     errors::NightlyError,
     state::{ClientId, SessionId, Sessions},
     structs::common::PendingRequest,
 };
+use axum::{extract::State, http::StatusCode, Json};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetPendingRequestsRequest {
-    #[serde(rename = "clientId")]
     pub client_id: ClientId,
-    #[serde(rename = "sessionId")]
     pub session_id: SessionId,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetPendingRequestsResponse {
-    #[serde(rename = "pendingRequests")]
     pub pending_requests: Vec<PendingRequest>,
 }
 pub async fn get_pending_requests(

diff --git a/server/src/http/get_session_info.rs b/server/src/http/get_session_info.rs
@@ -1,29 +1,29 @@
-use axum::{extract::State, http::StatusCode, Json};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
 use crate::{
     errors::NightlyError,
     state::{SessionId, Sessions},
     structs::common::{AppMetadata, Network, SessionStatus, Version},
 };
+use axum::{extract::State, http::StatusCode, Json};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetSessionInfoRequest {
-    #[serde(rename = "sessionId")]
     pub session_id: SessionId,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetSessionInfoResponse {
     pub status: SessionStatus,
     pub persistent: bool,
     pub version: Version,
     pub network: Network,
-    #[serde(rename = "appMetadata")]
     pub app_metadata: AppMetadata,
 }
+
 pub async fn get_session_info(
     State(sessions): State<Sessions>,
     Json(request): Json<HttpGetSessionInfoRequest>,

diff --git a/server/src/http/get_sessions.rs b/server/src/http/get_sessions.rs
@@ -6,15 +6,16 @@ use crate::state::{ClientId, ClientToSessions, ModifySession, SessionId};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpGetSessionsRequest {
-    #[serde(rename = "clientId")]
     client_id: ClientId,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct HttpGetSessionsResponse {
     sessions: Vec<SessionId>,
 }
+
 pub async fn get_sessions(
     State(client_to_sessions): State<ClientToSessions>,
     Json(request): Json<HttpGetSessionsRequest>,

diff --git a/server/src/http/resolve_request.rs b/server/src/http/resolve_request.rs
@@ -1,27 +1,25 @@
-use axum::{extract::State, http::StatusCode, Json};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
 use crate::{
     errors::NightlyError,
     state::{ClientId, Sessions},
     structs::app_messages::{app_messages::ServerToApp, payload::ResponsePayload},
 };
+use axum::{extract::State, http::StatusCode, Json};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct HttpResolveRequestRequest {
-    #[serde(rename = "clientId")]
     pub client_id: ClientId,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
-    #[serde(rename = "requestId")]
     pub request_id: String,
     pub content: String,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
 pub struct HttpResolveRequestResponse {}
+
 pub async fn resolve_request(
     State(sessions): State<Sessions>,
     Json(request): Json<HttpResolveRequestRequest>,

diff --git a/server/src/structs/app_messages/already_connected.rs b/server/src/structs/app_messages/already_connected.rs
@@ -3,7 +3,7 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct AlreadyConnected {
-    #[serde(rename = "sessionId")]
     pub session_id: String,
 }
diff --git a/server/src/structs/app_messages/app_messages.rs b/server/src/structs/app_messages/app_messages.rs
@@ -1,15 +1,13 @@
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
-use crate::structs::common::{AckMessage, ErrorMessage};
-
 use super::{
     already_connected::AlreadyConnected,
     initialize::{InitializeRequest, InitializeResponse},
     payload::{RequestPayload, ResponsePayload},
     user_connected_event::UserConnectedEvent,
     user_disconnected_event::UserDisconnectedEvent,
 };
+use crate::structs::common::{AckMessage, ErrorMessage};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize, TS)]
 #[ts(export)]

diff --git a/server/src/structs/app_messages/initialize.rs b/server/src/structs/app_messages/initialize.rs
@@ -5,31 +5,25 @@ use crate::structs::common::{AppMetadata, Network, Version};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct InitializeRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "appMetadata")]
     pub app_metadata: AppMetadata,
     pub network: Network,
     pub version: Version,
     pub persistent: bool,
-    #[serde(rename = "persistentSessionId")]
     #[ts(optional)]
     pub persistent_session_id: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct InitializeResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
-    #[serde(rename = "createdNew")]
     pub created_new: bool, // if the session was created new or if it was restored
-    #[serde(rename = "publicKeys")]
     pub public_keys: Vec<String>, // if session was restored, this is the list of public keys that were restored
-    #[serde(rename = "metadata")]
     #[ts(optional)]
     pub metadata: Option<String>, // if session was restored, this is the metadata that was restored
 }
diff --git a/server/src/structs/app_messages/payload.rs b/server/src/structs/app_messages/payload.rs
@@ -3,15 +3,15 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct RequestPayload {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub content: String,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ResponsePayload {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub content: String,
 }
diff --git a/server/src/structs/app_messages/user_connected_event.rs b/server/src/structs/app_messages/user_connected_event.rs
@@ -3,8 +3,8 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct UserConnectedEvent {
-    #[serde(rename = "publicKeys")]
     pub public_keys: Vec<String>,
     #[ts(optional)]
     pub metadata: Option<String>,

diff --git a/server/src/structs/client_messages/app_disconnected_event.rs b/server/src/structs/client_messages/app_disconnected_event.rs
@@ -3,8 +3,8 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct AppDisconnectedEvent {
-    #[serde(rename = "sessionId")]
     pub session_id: String,
     pub reason: String,
 }
diff --git a/server/src/structs/client_messages/client_initialize.rs b/server/src/structs/client_messages/client_initialize.rs
@@ -3,16 +3,15 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ClientInitializeRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "clientId")]
     pub client_id: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ClientInitializeResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
 }
diff --git a/server/src/structs/client_messages/client_messages.rs b/server/src/structs/client_messages/client_messages.rs
@@ -1,8 +1,3 @@
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
-use crate::structs::common::{AckMessage, ErrorMessage};
-
 use super::{
     app_disconnected_event::AppDisconnectedEvent,
     client_initialize::{ClientInitializeRequest, ClientInitializeResponse},
@@ -13,6 +8,9 @@ use super::{
     get_sessions::{GetSessionsRequest, GetSessionsResponse},
     new_payload_event::{NewPayloadEvent, NewPayloadEventReply},
 };
+use crate::structs::common::{AckMessage, ErrorMessage};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize, TS)]
 #[ts(export)]

diff --git a/server/src/structs/client_messages/connect.rs b/server/src/structs/client_messages/connect.rs
@@ -1,18 +1,14 @@
+use crate::structs::common::{Device, Notification};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::structs::common::{Device, Notification};
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ConnectRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "clientId")]
     pub client_id: String, // used for session resolution
-    #[serde(rename = "publicKeys")]
     pub public_keys: Vec<String>,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
     #[ts(optional)]
     pub notification: Option<Notification>,
@@ -24,7 +20,7 @@ pub struct ConnectRequest {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ConnectResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
 }
diff --git a/server/src/structs/client_messages/drop_sessions.rs b/server/src/structs/client_messages/drop_sessions.rs
@@ -5,17 +5,16 @@ use crate::state::SessionId;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct DropSessionsRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub sessions: Vec<SessionId>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct DropSessionsResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "droppedSessions")]
     pub dropped_sessions: Vec<SessionId>,
 }
diff --git a/server/src/structs/client_messages/get_info.rs b/server/src/structs/client_messages/get_info.rs
@@ -5,20 +5,18 @@ use crate::structs::common::{AppMetadata, Network, Version};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetInfoRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetInfoResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub network: Network,
     pub version: Version,
-    #[serde(rename = "appMetadata")]
     pub app_metadata: AppMetadata,
 }
diff --git a/server/src/structs/client_messages/get_pending_requests.rs b/server/src/structs/client_messages/get_pending_requests.rs
@@ -1,21 +1,19 @@
+use crate::structs::common::PendingRequest;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::structs::common::PendingRequest;
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetPendingRequestsRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetPendingRequestsResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub requests: Vec<PendingRequest>,
 }
diff --git a/server/src/structs/client_messages/get_sessions.rs b/server/src/structs/client_messages/get_sessions.rs
@@ -1,19 +1,18 @@
+use crate::state::SessionId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::state::SessionId;
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetSessionsRequest {
-    #[serde(rename = "responseId")]
     pub response_id: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct GetSessionsResponse {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub sessions: Vec<SessionId>,
 }
diff --git a/server/src/structs/client_messages/new_payload_event.rs b/server/src/structs/client_messages/new_payload_event.rs
@@ -3,22 +3,19 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct NewPayloadEvent {
-    #[serde(rename = "requestId")]
     pub request_id: String,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
     pub payload: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct NewPayloadEventReply {
-    #[serde(rename = "responseId")]
     pub response_id: String,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
-    #[serde(rename = "requestId")]
     pub request_id: String,
     pub content: String,
 }
diff --git a/server/src/structs/common.rs b/server/src/structs/common.rs
@@ -48,27 +48,28 @@ pub enum Device {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct ErrorMessage {
-    #[serde(rename = "responseId")]
     pub response_id: String,
     pub error: String,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct AckMessage {
-    #[serde(rename = "responseId")]
     pub response_id: String,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct Notification {
     pub token: String,
-    #[serde(rename = "notificationEndpoint")]
     pub notification_endpoint: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct AppMetadata {
     pub name: String,
     #[ts(optional)]
@@ -77,15 +78,14 @@ pub struct AppMetadata {
     pub description: Option<String>,
     #[ts(optional)]
     pub icon: Option<String>,
-    #[serde(rename = "additionalInfo")]
     #[ts(optional)]
     pub additional_info: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct PendingRequest {
-    #[serde(rename = "requestId")]
     pub request_id: String,
     pub content: String,
 }
diff --git a/server/src/structs/notification_msg.rs b/server/src/structs/notification_msg.rs
@@ -5,16 +5,14 @@ use ts_rs::TS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct NotificationPayload {
     pub token: String,
     pub network: Network,
-    #[serde(rename = "sessionId")]
     pub session_id: String,
-    #[serde(rename = "appMetadata")]
     pub app_metadata: AppMetadata,
     pub device: Device,
     pub request: String,
-    #[serde(rename = "requestId")]
     pub request_id: String,
 }
 

diff --git a/server/src/structs/wallet_metadata.rs b/server/src/structs/wallet_metadata.rs
@@ -10,22 +10,20 @@ use super::{
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct WalletMetadata {
     pub slug: String, // Should be unique
     pub name: String,
     pub description: String,
     pub homepage: String,
     pub chains: Vec<Network>,
     pub version: Version,
-    #[serde(rename = "walletType")]
     pub wallet_type: WalletType,
     pub mobile: Option<Deeplink>,
     pub desktop: Option<Deeplink>,
     pub image: Images,
     pub app: HashMap<Platform, String>,
-    #[serde(rename = "injectPath")]
     pub inject_path: HashMap<Network, String>,
-    #[serde(rename = "lastUpdatedTimestamp")]
     pub last_updated_timestamp: u64,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TS)]