diff --git a/rs/ic-management-backend/Cargo.toml b/rs/ic-management-backend/Cargo.toml index 0a7d3f88..cde5cf12 100644 --- a/rs/ic-management-backend/Cargo.toml +++ b/rs/ic-management-backend/Cargo.toml @@ -23,7 +23,6 @@ actix-web = { version = "4.2.1", default-features = false, features = [ ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "794fc5b9341fa8f6a0e8f219201c35f0b5727ab9" } ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "794fc5b9341fa8f6a0e8f219201c35f0b5727ab9" } anyhow = "1.0.43" -serde_with = "3.0.0" futures = "0.3.16" serde_yaml = "0.9.11" reqwest = { version = "0.11.4", features = ["json"] } diff --git a/rs/ic-management-types/Cargo.toml b/rs/ic-management-types/Cargo.toml index d4f53428..6d66acdc 100644 --- a/rs/ic-management-types/Cargo.toml +++ b/rs/ic-management-types/Cargo.toml @@ -19,7 +19,6 @@ itertools = "0.10.3" reqwest = { version = "0.11.9", features = ["json"] } serde = "1.0.127" serde_json = "1.0.66" -serde_with = "2.0.1" strum = "0.24.1" strum_macros = "0.24.3" url = "2.2.2" diff --git a/rs/ic-management-types/src/lib.rs b/rs/ic-management-types/src/lib.rs index cf718ce6..160aa507 100644 --- a/rs/ic-management-types/src/lib.rs +++ b/rs/ic-management-types/src/lib.rs @@ -16,7 +16,6 @@ use registry_canister::mutations::do_remove_nodes_from_subnet::RemoveNodesFromSu use registry_canister::mutations::do_update_subnet_replica::UpdateSubnetReplicaVersionPayload; use registry_canister::mutations::node_management::do_remove_nodes::RemoveNodesPayload; use serde::{Deserialize, Serialize}; -use serde_with::{serde_as, DisplayFromStr}; use std::cmp::{Eq, Ord, PartialEq, PartialOrd}; use std::collections::BTreeMap; use std::convert::TryFrom; @@ -139,10 +138,8 @@ impl From<(ProposalInfo, T)> for TopologyChangeProposa } } -#[serde_as] #[derive(Clone, Serialize, Deserialize)] pub struct Subnet { - #[serde_as(as = "DisplayFromStr")] pub principal: PrincipalId, pub nodes: Vec, pub subnet_type: SubnetType, @@ -165,10 +162,8 @@ pub struct SubnetMetadata { pub applications: Option>, } -#[serde_as] #[derive(Clone, Serialize, Debug, Deserialize)] pub struct Node { - #[serde_as(as = "DisplayFromStr")] pub principal: PrincipalId, pub ip_addr: Ipv6Addr, pub operator: Operator, @@ -258,10 +253,8 @@ pub struct CreateSubnetProposalInfo { pub nodes: Vec, } -#[serde_as] #[derive(Clone, Serialize, Default, Debug, Deserialize)] pub struct Operator { - #[serde_as(as = "DisplayFromStr")] pub principal: PrincipalId, pub provider: Provider, pub allowance: u64, @@ -270,10 +263,8 @@ pub struct Operator { pub datacenter: Option, } -#[serde_as] #[derive(Clone, Serialize, Default, Debug, Deserialize)] pub struct Provider { - #[serde_as(as = "DisplayFromStr")] pub principal: PrincipalId, #[serde(skip_serializing_if = "Option::is_none")] pub name: Option,