From f3cb6a61cc0d8d44ffcdc08c98134e47ba100426 Mon Sep 17 00:00:00 2001 From: J-Loudet Date: Wed, 21 Feb 2024 17:06:29 +0100 Subject: [PATCH] refacto(descriptors): only specify runtime in `mapping` section (#188) These fields were wrongfully forgotten during the major refactoring. Signed-off-by: Julien Loudet --- zenoh-flow-descriptors/src/nodes/mod.rs | 4 +--- zenoh-flow-descriptors/src/nodes/operator/mod.rs | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/zenoh-flow-descriptors/src/nodes/mod.rs b/zenoh-flow-descriptors/src/nodes/mod.rs index dde094e2..deeb32b2 100644 --- a/zenoh-flow-descriptors/src/nodes/mod.rs +++ b/zenoh-flow-descriptors/src/nodes/mod.rs @@ -19,13 +19,11 @@ pub(crate) mod source; use serde::{Deserialize, Serialize}; use url::Url; -use zenoh_flow_commons::{Configuration, RuntimeId}; +use zenoh_flow_commons::Configuration; #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq)] pub struct RemoteNodeDescriptor { pub descriptor: Url, #[serde(default)] pub configuration: Configuration, - #[serde(default)] - pub runtime: Option, } diff --git a/zenoh-flow-descriptors/src/nodes/operator/mod.rs b/zenoh-flow-descriptors/src/nodes/operator/mod.rs index f0f8634a..aa7b0571 100644 --- a/zenoh-flow-descriptors/src/nodes/operator/mod.rs +++ b/zenoh-flow-descriptors/src/nodes/operator/mod.rs @@ -18,7 +18,7 @@ use super::RemoteNodeDescriptor; use serde::{Deserialize, Serialize}; use std::sync::Arc; use url::Url; -use zenoh_flow_commons::{Configuration, NodeId, PortId, RuntimeId}; +use zenoh_flow_commons::{Configuration, NodeId, PortId}; /// A `OperatorDescriptor` uniquely identifies a Operator. /// @@ -78,9 +78,7 @@ use zenoh_flow_commons::{Configuration, NodeId, PortId, RuntimeId}; /// #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq)] pub struct OperatorDescriptor { - pub id: NodeId, - #[serde(default)] - pub runtime: Option, + pub(crate) id: NodeId, #[serde(flatten)] pub(crate) variant: OperatorVariants, }