Skip to content
This repository has been archived by the owner on Oct 31, 2024. It is now read-only.

feat: remove task manager channels #391

Merged
merged 1 commit into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions crates/topos-tce-broadcast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
26 changes: 1 addition & 25 deletions crates/topos-tce-broadcast/src/double_echo/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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
Expand Down
5 changes: 1 addition & 4 deletions crates/topos-tce-broadcast/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
157 changes: 0 additions & 157 deletions crates/topos-tce-broadcast/src/task_manager_channels/mod.rs

This file was deleted.

103 changes: 0 additions & 103 deletions crates/topos-tce-broadcast/src/task_manager_channels/task.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/topos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@ predicates = "3.0.3"

[features]
default = []
broadcast_via_channels = ["default", "topos-tce-broadcast/task-manager-channels"]