chore: minor adds

ipvm-wg · Jul 4, 2023 · d39ae60 · d39ae60
1 parent d90870f
commit d39ae60
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/homestar-runtime/src/event_handler/event.rs b/homestar-runtime/src/event_handler/event.rs
@@ -42,6 +42,8 @@ pub enum Event {
     /// [Record]: libp2p::kad::Record
     /// [Receipt]: homestar_core::workflow::Receipt
     FindRecord(QueryRecord),
+    /// TODO
+    RemoveRecord(QueryRecord),
 }
 
 impl Event {
@@ -63,6 +65,7 @@ impl Event {
                 let _ = tx.send(());
             }
             Event::FindRecord(record) => record.find(event_handler),
+            Event::RemoveRecord(record) => record.remove(event_handler),
         }
         Ok(())
     }
@@ -138,6 +141,8 @@ impl Captured {
                 .put_record(Record::new(wf_cid_bytes, wf_bytes), workflow_quorum)
                 .map_err(anyhow::Error::msg)?;
 
+            // TODO: Handle Workflow Complete / Num of Tasks finished.
+
             Ok((receipt_cid, receipt_bytes.to_vec()))
         } else {
             Err(anyhow!("cannot convert receipt {receipt_cid} to bytes"))
@@ -162,6 +167,17 @@ impl QueryRecord {
             .get_record(Key::new(&self.cid.to_bytes()));
         event_handler.worker_swarm_senders.insert(id, self.sender);
     }
+
+    fn remove<DB>(self, event_handler: &mut EventHandler<DB>)
+    where
+        DB: Database,
+    {
+        event_handler
+            .swarm
+            .behaviour_mut()
+            .kademlia
+            .remove_record(&Key::new(&self.cid.to_bytes()));
+    }
 }
 
 #[async_trait]

diff --git a/homestar-runtime/src/runner.rs b/homestar-runtime/src/runner.rs
@@ -102,7 +102,6 @@ impl Runner {
 
             tokio::spawn({
                 let settings = settings.node().network().clone();
-                println!("Fuck");
                 WebSocketServer::start(settings, ws_tx.clone(), oneshot_sender.into())
             });
 
@@ -247,10 +246,16 @@ mod test {
     use super::*;
     use homestar_core::test_utils;
     use rand::thread_rng;
-    use std::time::Duration;
+    use std::{
+        sync::atomic::{AtomicUsize, Ordering},
+        time::Duration,
+    };
+
+    static ATOMIC_PORT: AtomicUsize = AtomicUsize::new(1338);
 
     async fn setup() -> Runner {
-        let settings = Settings::load().unwrap();
+        let mut settings = Settings::load().unwrap();
+        settings.node.network.websocket_port = ATOMIC_PORT.fetch_add(1, Ordering::SeqCst) as u16;
         let db = crate::test_utils::db::MemoryDb::setup_connection_pool(
             Settings::load().unwrap().node(),
         )

diff --git a/homestar-runtime/src/settings.rs b/homestar-runtime/src/settings.rs
@@ -45,8 +45,8 @@ pub struct Monitoring {
 /// Application settings.
 #[derive(Clone, Debug, Deserialize, PartialEq)]
 pub struct Settings {
-    monitoring: Monitoring,
-    node: Node,
+    pub(crate) monitoring: Monitoring,
+    pub(crate) node: Node,
 }
 
 impl Settings {