From 598014bf300f68cc6000992080fb0fbb5f2d9ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 21 May 2024 15:41:38 +0100 Subject: [PATCH] fixed deserialisation of 'AuxiliaryDetails' api response --- .../src/api/v1/node/models.rs | 2 -- nym-node/nym-node-requests/src/helpers.rs | 20 ------------------- nym-node/nym-node-requests/src/lib.rs | 2 -- 3 files changed, 24 deletions(-) delete mode 100644 nym-node/nym-node-requests/src/helpers.rs diff --git a/nym-node/nym-node-requests/src/api/v1/node/models.rs b/nym-node/nym-node-requests/src/api/v1/node/models.rs index b9cbdd528f..7b7c820de9 100644 --- a/nym-node/nym-node-requests/src/api/v1/node/models.rs +++ b/nym-node/nym-node-requests/src/api/v1/node/models.rs @@ -1,7 +1,6 @@ // Copyright 2023-2024 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crate::helpers::de_maybe_stringified; use celes::Country; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -171,7 +170,6 @@ pub struct NodeDescription { #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] pub struct AuxiliaryDetails { /// Optional ISO 3166 alpha-2 two-letter country code of the node's **physical** location - #[serde(deserialize_with = "de_maybe_stringified")] #[cfg_attr(feature = "openapi", schema(example = "PL", value_type = Option))] #[schemars(with = "Option")] #[schemars(length(equal = 2))] diff --git a/nym-node/nym-node-requests/src/helpers.rs b/nym-node/nym-node-requests/src/helpers.rs deleted file mode 100644 index 6dd35a3e92..0000000000 --- a/nym-node/nym-node-requests/src/helpers.rs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2024 - Nym Technologies SA -// SPDX-License-Identifier: Apache-2.0 - -use serde::{Deserialize, Deserializer}; -use std::fmt::Display; -use std::str::FromStr; - -pub fn de_maybe_stringified<'de, D, T, E>(deserializer: D) -> Result, D::Error> -where - D: Deserializer<'de>, - T: FromStr, - E: Display, -{ - let raw = String::deserialize(deserializer)?; - if raw.is_empty() { - Ok(None) - } else { - Ok(Some(raw.parse().map_err(serde::de::Error::custom)?)) - } -} diff --git a/nym-node/nym-node-requests/src/lib.rs b/nym-node/nym-node-requests/src/lib.rs index e8519a5073..eb59b0a280 100644 --- a/nym-node/nym-node-requests/src/lib.rs +++ b/nym-node/nym-node-requests/src/lib.rs @@ -6,8 +6,6 @@ pub mod api; pub mod error; -pub(crate) mod helpers; - macro_rules! absolute_route { ( $name:ident, $parent:expr, $suffix:expr ) => { pub fn $name() -> String {