From b953e9f6b57089c162773fa9384b1a3d7df148a5 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 26 Jul 2023 13:08:15 +0200 Subject: [PATCH] node: Use `camelCase` for control socket data It's easier if we use camel-case everywhere, because some types may be used on the web as well as on the control socket. This way, all json-encoded data looks the same. --- radicle/src/node.rs | 4 ++-- radicle/src/node/address/types.rs | 4 ++-- radicle/src/node/events.rs | 2 +- radicle/src/storage.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radicle/src/node.rs b/radicle/src/node.rs index 74f2c211..5ccc0414 100644 --- a/radicle/src/node.rs +++ b/radicle/src/node.rs @@ -361,7 +361,7 @@ pub struct Session { } #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "kebab-case")] +#[serde(rename_all = "camelCase")] pub struct Seed { pub nid: NodeId, pub addrs: Vec, @@ -424,7 +424,7 @@ pub enum AnnounceEvent { } #[derive(Debug, Serialize, Deserialize)] -#[serde(tag = "status", rename_all = "kebab-case")] +#[serde(tag = "status", rename_all = "camelCase")] pub enum FetchResult { Success { updated: Vec, diff --git a/radicle/src/node/address/types.rs b/radicle/src/node/address/types.rs index 0e3ee44a..88325d00 100644 --- a/radicle/src/node/address/types.rs +++ b/radicle/src/node/address/types.rs @@ -91,7 +91,7 @@ pub struct Node { /// A known address. #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "kebab-case")] +#[serde(rename_all = "camelCase")] pub struct KnownAddress { /// Network address. pub addr: Address, @@ -117,7 +117,7 @@ impl KnownAddress { /// Address source. Specifies where an address originated from. #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "kebab-case")] +#[serde(rename_all = "camelCase")] pub enum Source { /// An address that was shared by another peer. Peer, diff --git a/radicle/src/node/events.rs b/radicle/src/node/events.rs index 71b938cf..e8c48095 100644 --- a/radicle/src/node/events.rs +++ b/radicle/src/node/events.rs @@ -8,7 +8,7 @@ use crate::storage::RefUpdate; /// A service event. #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "kebab-case", tag = "type")] +#[serde(rename_all = "camelCase", tag = "type")] pub enum Event { RefsFetched { remote: NodeId, diff --git a/radicle/src/storage.rs b/radicle/src/storage.rs index fa92f968..14d973f0 100644 --- a/radicle/src/storage.rs +++ b/radicle/src/storage.rs @@ -122,7 +122,7 @@ pub type RemoteId = PublicKey; /// An update to a reference. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] -#[serde(rename_all = "kebab-case")] +#[serde(rename_all = "camelCase")] pub enum RefUpdate { Updated { name: RefString, old: Oid, new: Oid }, Created { name: RefString, oid: Oid },