Removed Io type def export.

Author: horned-sphere

runtime/swimos_runtime/src/agent/mod.rs

@@ -49,7 +49,7 @@ use std::{
     time::Duration,
 };
 
-use crate::downlink::DownlinkOptions;
+use crate::{downlink::DownlinkOptions, Io};
 
 use self::{
     reporting::{UplinkReportReader, UplinkReporter},
@@ -294,8 +294,6 @@ impl AgentContext for AgentRuntimeContext {
     }
 }
 
-/// Ends of two independent channels (for example the input and output channels of an agent).
-type Io = (ByteWriter, ByteReader);
 
 /// Reasons that a remote connected to an agent runtime task could be disconnected.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

runtime/swimos_runtime/src/agent/task/external_links/mod.rs

@@ -45,8 +45,7 @@ use tracing::{debug, error, trace};
 use uuid::Uuid;
 
 use crate::{
-    agent::{CommanderKey, CommanderRequest, DownlinkRequest, LinkRequest},
-    downlink::Io,
+    agent::{CommanderKey, CommanderRequest, DownlinkRequest, LinkRequest}, Io,
 };
 
 use super::{AdHocChannelRequest, ExternalLinkRequest};

runtime/swimos_runtime/src/agent/task/external_links/tests.rs

@@ -19,7 +19,7 @@ use crate::{
         task::{external_links, AdHocChannelRequest, ExternalLinkRequest},
         CommanderKey, CommanderRequest, DownlinkRequest, LinkRequest,
     },
-    downlink::{DownlinkOptions, Io},
+    downlink::DownlinkOptions, Io,
 };
 use bytes::Bytes;
 use futures::{

runtime/swimos_runtime/src/downlink/mod.rs

@@ -18,6 +18,7 @@ use std::time::Duration;
 
 use crate::downlink::failure::BadFrameResponse;
 use crate::timeout_coord::{VoteResult, Voter};
+use crate::Io;
 use backpressure::DownlinkBackpressure;
 use bitflags::bitflags;
 use bytes::{Bytes, BytesMut};
@@ -78,8 +79,6 @@ bitflags! {
     }
 }
 
-pub type Io = (ByteWriter, ByteReader);
-
 impl WriteTaskState {
     /// If a new consumer needs to be synced, set the appropriate state bit.
     pub fn set_needs_sync(&mut self, options: DownlinkOptions) {

runtime/swimos_runtime/src/lib.rs

@@ -18,9 +18,14 @@
 //! the Warp protocol only and are entirely decoupled from the state and user defined behaviour
 //! of the the agents/downlinks.
 
+use swimos_utilities::byte_channel::{ByteReader, ByteWriter};
+
 /// The agent runtime task.
 pub mod agent;
 mod backpressure;
 /// The downlink runtime task.
 pub mod downlink;
 mod timeout_coord;
+
+/// Ends of two independent channels (for example the input and output channels of an agent).
+type Io = (ByteWriter, ByteReader);

server/swimos_introspection/src/meta_mesh/mod.rs

@@ -33,8 +33,7 @@ use swimos_form::read::{ReadError, ReadEvent, Recognizer, RecognizerReadable};
 use swimos_form::write::{StructuralWritable, StructuralWriter};
 use swimos_form::Form;
 use swimos_model::Text;
-use swimos_runtime::downlink::Io;
-use swimos_utilities::routing::RouteUri;
+use swimos_utilities::{byte_channel::{ByteReader, ByteWriter}, routing::RouteUri};
 use swimos_utilities::trigger;
 use tokio_util::codec::{FramedRead, FramedWrite};
 
@@ -205,6 +204,8 @@ impl RecognizerReadable for NodeInfo {
     }
 }
 
+type Io = (ByteWriter, ByteReader);
+
 async fn run_task(
     shutdown_rx: trigger::Receiver,
     agents: Arc<RwLock<UriForest<AgentMeta>>>,

server/swimos_server_app/src/lib.rs

@@ -30,3 +30,6 @@ pub mod introspection {
 }
 
 pub use ratchet::deflate::DeflateConfig;
+use swimos_utilities::byte_channel::{ByteReader, ByteWriter};
+
+type Io = (ByteWriter, ByteReader);

server/swimos_server_app/src/server/runtime/downlinks/mod.rs

@@ -43,7 +43,7 @@ use swimos_runtime::{
     agent::{CommanderKey, CommanderRequest, DownlinkRequest, LinkRequest},
     downlink::{
         failure::{AlwaysAbortStrategy, AlwaysIgnoreStrategy, ReportStrategy},
-        AttachAction, DownlinkRuntimeConfig, Io, MapDownlinkRuntime, ValueDownlinkRuntime,
+        AttachAction, DownlinkRuntimeConfig, MapDownlinkRuntime, ValueDownlinkRuntime,
     },
 };
 use swimos_utilities::{
@@ -56,7 +56,7 @@ use tokio::{
 };
 use uuid::Uuid;
 
-use crate::server::runtime::downlinks::pending::Waiting;
+use crate::{server::runtime::downlinks::pending::Waiting, Io};
 
 use super::{
     ids::{IdIssuer, IdKind},

server/swimos_server_app/src/server/runtime/downlinks/tests.rs

@@ -44,7 +44,7 @@ use swimos_remote::dns::{DnsFut, DnsResolver};
 use swimos_remote::SchemeHostPort;
 use swimos_runtime::{
     agent::{CommanderKey, CommanderRequest, DownlinkRequest, LinkRequest},
-    downlink::{DownlinkOptions, DownlinkRuntimeConfig, Io},
+    downlink::{DownlinkOptions, DownlinkRuntimeConfig},
 };
 use swimos_utilities::{
     byte_channel::{are_connected, ByteReader, ByteWriter},
@@ -56,7 +56,7 @@ use uuid::Uuid;
 
 use crate::server::runtime::{ClientRegistration, EstablishedClient, NewClientError};
 
-use super::{downlink_task_connector, DlTaskRequest, DownlinkConnectionTask, ServerConnector};
+use super::{downlink_task_connector, DlTaskRequest, DownlinkConnectionTask, Io, ServerConnector};
 
 struct TestContext {
     connector: ServerConnector,

server/swimos_server_app/src/server/runtime/mod.rs

@@ -43,7 +43,6 @@ use swimos_runtime::agent::{
     AgentAttachmentRequest, AgentExecError, AgentRouteDescriptor, AgentRouteChannels, AgentRouteTask,
     CombinedAgentConfig, DisconnectionReason, LinkRequest,
 };
-use swimos_runtime::downlink::Io;
 use swimos_utilities::routing::RouteUri;
 
 use swimos_remote::websocket::{RatchetError, Websockets};
@@ -61,6 +60,7 @@ use crate::config::SwimServerConfig;
 use crate::plane::PlaneModel;
 use crate::server::runtime::downlinks::DlTaskRequest;
 use crate::server::ServerHandle;
+use crate::Io;
 
 use self::downlinks::{DownlinkConnectionTask, ServerConnector};
 use self::ids::{IdIssuer, IdKind};