feat: remove task manager channels (#391)

Signed-off-by: Simon Paitrault <simon.paitrault@gmail.com>
topos-protocol · Nov 30, 2023 · f5fa427 · f5fa427
1 parent f0bc90c
commit f5fa427
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 293 deletions.
diff --git a/crates/topos-tce-broadcast/Cargo.toml b/crates/topos-tce-broadcast/Cargo.toml
@@ -33,9 +33,6 @@ rand.workspace = true
 hex.workspace = true
 topos-test-sdk = { path = "../topos-test-sdk/" }
 
-[features]
-task-manager-channels = []
-
 [[bench]]
 name = "double_echo"
 path = "benches/double_echo.rs"

diff --git a/crates/topos-tce-broadcast/src/double_echo/mod.rs b/crates/topos-tce-broadcast/src/double_echo/mod.rs
@@ -76,14 +76,13 @@ impl DoubleEcho {
         }
     }
 
-    #[cfg(not(feature = "task-manager-channels"))]
     pub fn spawn_task_manager(
         &mut self,
         task_manager_message_receiver: mpsc::Receiver<DoubleEchoCommand>,
     ) -> mpsc::Receiver<(CertificateId, TaskStatus)> {
         let (task_completion_sender, task_completion_receiver) = mpsc::channel(2048);
 
-        let (task_manager, shutdown_receiver) = crate::task_manager_futures::TaskManager::new(
+        let (task_manager, shutdown_receiver) = crate::task_manager::TaskManager::new(
             task_manager_message_receiver,
             task_completion_sender,
             self.subscriptions.clone(),
@@ -100,29 +99,6 @@ impl DoubleEcho {
         task_completion_receiver
     }
 
-    #[cfg(feature = "task-manager-channels")]
-    pub fn spawn_task_manager(
-        &mut self,
-        task_manager_message_receiver: mpsc::Receiver<DoubleEchoCommand>,
-    ) -> mpsc::Receiver<(CertificateId, TaskStatus)> {
-        let (task_completion_sender, task_completion_receiver) = mpsc::channel(2048);
-
-        let (task_manager, shutdown_receiver) = crate::task_manager_channels::TaskManager::new(
-            task_manager_message_receiver,
-            task_completion_sender,
-            self.subscriptions.clone(),
-            self.event_sender.clone(),
-            self.validator_id,
-            self.message_signer.clone(),
-            self.params.clone(),
-            self.validator_store.clone(),
-        );
-
-        tokio::spawn(task_manager.run(shutdown_receiver));
-
-        task_completion_receiver
-    }
-
     /// DoubleEcho main loop
     ///   - Listen for shutdown signal
     ///   - Read new messages from command_receiver

diff --git a/crates/topos-tce-broadcast/src/lib.rs b/crates/topos-tce-broadcast/src/lib.rs
@@ -58,10 +58,7 @@ mod constant;
 pub mod double_echo;
 pub mod sampler;
 
-#[cfg(feature = "task-manager-channels")]
-pub mod task_manager_channels;
-#[cfg(not(feature = "task-manager-channels"))]
-pub mod task_manager_futures;
+pub mod task_manager;
 
 #[cfg(test)]
 mod tests;

diff --git a/...broadcast/src/task_manager_futures/mod.rs → ...pos-tce-broadcast/src/task_manager/mod.rs b/...broadcast/src/task_manager_futures/mod.rs → ...pos-tce-broadcast/src/task_manager/mod.rs
diff --git a/...roadcast/src/task_manager_futures/task.rs → ...os-tce-broadcast/src/task_manager/task.rs b/...roadcast/src/task_manager_futures/task.rs → ...os-tce-broadcast/src/task_manager/task.rs
diff --git a/crates/topos-tce-broadcast/src/task_manager_channels/mod.rs b/crates/topos-tce-broadcast/src/task_manager_channels/mod.rs
diff --git a/crates/topos-tce-broadcast/src/task_manager_channels/task.rs b/crates/topos-tce-broadcast/src/task_manager_channels/task.rs
diff --git a/crates/topos/Cargo.toml b/crates/topos/Cargo.toml
@@ -70,4 +70,3 @@ predicates = "3.0.3"
 
 [features]
 default = []
-broadcast_via_channels = ["default", "topos-tce-broadcast/task-manager-channels"]