Updates to new boxed API

Author: SirCipher

server/swimos_agent/src/agent_model/downlink/hosted/event/mod.rs

@@ -39,7 +39,7 @@ use crate::{
     },
     config::SimpleDownlinkConfig,
     downlink_lifecycle::EventDownlinkLifecycle,
-    event_handler::{LocalBoxEventHandler, HandlerActionExt},
+    event_handler::{HandlerActionExt, LocalBoxEventHandler},
 };
 
 use super::{DlState, DlStateObserver, DlStateTracker};

server/swimos_agent/src/agent_model/downlink/hosted/event/tests.rs

@@ -32,7 +32,7 @@ use super::{EventDownlinkFactory, SimpleDownlinkConfig};
 use crate::{
     agent_model::downlink::{BoxDownlinkChannel, DownlinkChannelEvent},
     downlink_lifecycle::{OnConsumeEvent, OnFailed, OnLinked, OnSynced, OnUnlinked},
-    event_handler::{LocalBoxEventHandler, HandlerActionExt, SideEffect},
+    event_handler::{HandlerActionExt, LocalBoxEventHandler, SideEffect},
 };
 
 struct FakeAgent;

server/swimos_agent/src/agent_model/downlink/hosted/map/mod.rs

@@ -45,13 +45,14 @@ use tokio::sync::mpsc;
 use tokio_util::codec::{FramedRead, FramedWrite};
 use tracing::{debug, error, info, trace};
 
+use crate::event_handler::LocalBoxEventHandler;
 use crate::{
     agent_model::downlink::{
         BoxDownlinkChannel, DownlinkChannel, DownlinkChannelError, DownlinkChannelEvent,
     },
     config::MapDownlinkConfig,
     downlink_lifecycle::MapDownlinkLifecycle,
-    event_handler::{BoxEventHandler, HandlerActionExt, Sequentially},
+    event_handler::{HandlerActionExt, Sequentially},
     event_queue::EventQueue,
 };
 
@@ -497,7 +498,8 @@ where
                         MapMessage::Clear => {
                             trace!("Clearing the map.");
                             let old_map = state.clear();
-                            maybe_lifecycle.map(|lifecycle| lifecycle.on_clear(old_map).boxed_local())
+                            maybe_lifecycle
+                                .map(|lifecycle| lifecycle.on_clear(old_map).boxed_local())
                         }
                         MapMessage::Take(n) => {
                             trace!("Retaining the first {} items.", n);

server/swimos_agent/src/agent_model/downlink/hosted/value/mod.rs

@@ -46,7 +46,7 @@ use crate::{
     },
     config::SimpleDownlinkConfig,
     downlink_lifecycle::ValueDownlinkLifecycle,
-    event_handler::{LocalBoxEventHandler, HandlerActionExt},
+    event_handler::{HandlerActionExt, LocalBoxEventHandler},
 };
 
 use super::{DlState, DlStateObserver, DlStateTracker, OutputWriter, RestartableOutput};

server/swimos_agent/src/agent_model/downlink/hosted/value/tests.rs

@@ -1153,7 +1153,7 @@ impl TestState {
 }
 
 impl OnLinked<FakeAgent> for TestState {
-    type OnLinkedHandler<'a> = BoxEventHandler<'a, FakeAgent>
+    type OnLinkedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
         where
             Self: 'a;
 
@@ -1167,7 +1167,7 @@ impl OnLinked<FakeAgent> for TestState {
 }
 
 impl OnUnlinked<FakeAgent> for TestState {
-    type OnUnlinkedHandler<'a> = BoxEventHandler<'a, FakeAgent>
+    type OnUnlinkedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
         where
             Self: 'a;
 
@@ -1181,7 +1181,7 @@ impl OnUnlinked<FakeAgent> for TestState {
 }
 
 impl OnFailed<FakeAgent> for TestState {
-    type OnFailedHandler<'a> = BoxEventHandler<'a, FakeAgent>
+    type OnFailedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
         where
             Self: 'a;
 
@@ -1191,7 +1191,7 @@ impl OnFailed<FakeAgent> for TestState {
 }
 
 impl OnSynced<i32, FakeAgent> for TestState {
-    type OnSyncedHandler<'a> = BoxEventHandler<'a, FakeAgent>
+    type OnSyncedHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
         where
             Self: 'a;
 
@@ -1207,7 +1207,7 @@ impl OnSynced<i32, FakeAgent> for TestState {
 }
 
 impl OnDownlinkEvent<i32, FakeAgent> for TestState {
-    type OnEventHandler<'a> = BoxEventHandler<'a, FakeAgent>
+    type OnEventHandler<'a> = LocalBoxEventHandler<'a, FakeAgent>
         where
             Self: 'a;
 

server/swimos_agent/src/agent_model/downlink/mod.rs

@@ -30,7 +30,7 @@ use thiserror::Error;
 use tokio::sync::mpsc;
 use tracing::error;
 
-use crate::event_handler::BoxEventHandler;
+use crate::event_handler::LocalBoxEventHandler;
 use crate::{
     config::{MapDownlinkConfig, SimpleDownlinkConfig},
     downlink_lifecycle::{EventDownlinkLifecycle, MapDownlinkLifecycle, ValueDownlinkLifecycle},
@@ -313,7 +313,7 @@ pub trait DownlinkChannel<Context> {
 
     /// After a call to `await_ready` that does not return [`None`] this may return an event handler to
     /// be executed by the agent task. At any other time, it will return [`None`].
-    fn next_event(&mut self, context: &Context) -> Option<BoxEventHandler<'_, Context>>;
+    fn next_event(&mut self, context: &Context) -> Option<LocalBoxEventHandler<'_, Context>>;
 
     /// Flush any pending outputs.
     fn flush(&mut self) -> BoxFuture<'_, Result<(), std::io::Error>>;

server/swimos_agent/src/agent_model/tests/mod.rs

@@ -42,7 +42,7 @@ use uuid::Uuid;
 
 use crate::{
     agent_model::HostedDownlinkEvent,
-    event_handler::{LocalBoxEventHandler, HandlerActionExt, UnitHandler},
+    event_handler::{HandlerActionExt, LocalBoxEventHandler, UnitHandler},
 };
 
 use self::{