Skip to content

Commit

Permalink
refacto(descriptors): only specify runtime in mapping section (#188)
Browse files Browse the repository at this point in the history
These fields were wrongfully forgotten during the major refactoring.

Signed-off-by: Julien Loudet <julien.loudet@zettascale.tech>
  • Loading branch information
J-Loudet authored Feb 21, 2024
1 parent 7f555f2 commit f3cb6a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 1 addition & 3 deletions zenoh-flow-descriptors/src/nodes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<RuntimeId>,
}
6 changes: 2 additions & 4 deletions zenoh-flow-descriptors/src/nodes/operator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -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<RuntimeId>,
pub(crate) id: NodeId,
#[serde(flatten)]
pub(crate) variant: OperatorVariants,
}
Expand Down

0 comments on commit f3cb6a6

Please sign in to comment.