Skip to content
Open
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
58 changes: 29 additions & 29 deletions controller/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,6 @@ mod tests {
use hyperactor::clock::Clock;
use hyperactor::clock::RealClock;
use hyperactor::context::Mailbox as _;
use hyperactor::data::Named;
use hyperactor::id;
use hyperactor::mailbox::BoxedMailboxSender;
use hyperactor::mailbox::DialMailboxRouter;
Expand Down Expand Up @@ -1129,8 +1128,7 @@ mod tests {

// Build a supervisor.
let sup_mail = system.attach().await.unwrap();
let (sup_tx, _sup_rx) = sup_mail.open_port::<ProcSupervisionMessage>();
sup_tx.bind_to(ProcSupervisionMessage::port());
let (_sup_tx, _sup_rx) = sup_mail.bind_actor_port::<ProcSupervisionMessage>();
let sup_ref = ActorRef::<ProcSupervisor>::attest(sup_mail.self_id().clone());

// Construct a system sender.
Expand Down Expand Up @@ -1360,8 +1358,7 @@ mod tests {

// Build a supervisor.
let sup_mail = system.attach().await.unwrap();
let (sup_tx, _sup_rx) = sup_mail.open_port::<ProcSupervisionMessage>();
sup_tx.bind_to(ProcSupervisionMessage::port());
let (_sup_tx, _sup_rx) = sup_mail.bind_actor_port::<ProcSupervisionMessage>();
let sup_ref = ActorRef::<ProcSupervisor>::attest(sup_mail.self_id().clone());

// Construct a system sender.
Expand Down Expand Up @@ -1665,9 +1662,8 @@ mod tests {
.await
.unwrap();

let (client_supervision_tx, mut client_supervision_rx) =
client_mailbox.open_port::<ClientMessage>();
client_supervision_tx.bind_to(ClientMessage::port());
let (_client_supervision_tx, mut client_supervision_rx) =
client_mailbox.bind_actor_port::<ClientMessage>();

// mock a proc actor that doesn't update supervision state
let (
Expand All @@ -1682,14 +1678,17 @@ mod tests {
// Join the world.
server_handle
.system_actor_handle()
.send(SystemMessage::Join {
proc_id: local_proc_id.clone(),
world_id,
proc_message_port: local_proc_message_port.bind(),
proc_addr: local_proc_addr,
labels: HashMap::new(),
lifecycle_mode: ProcLifecycleMode::ManagedBySystem,
})
.send(
&client_mailbox,
SystemMessage::Join {
proc_id: local_proc_id.clone(),
world_id,
proc_message_port: local_proc_message_port.bind(),
proc_addr: local_proc_addr,
labels: HashMap::new(),
lifecycle_mode: ProcLifecycleMode::ManagedBySystem,
},
)
.unwrap();

assert_matches!(
Expand Down Expand Up @@ -1726,9 +1725,8 @@ mod tests {
// Client actor.
let mut system = System::new(server_handle.local_addr().clone());
let client_mailbox = system.attach().await.unwrap();
let (client_supervision_tx, mut client_supervision_rx) =
client_mailbox.open_port::<ClientMessage>();
client_supervision_tx.bind_to(ClientMessage::port());
let (_client_supervision_tx, mut client_supervision_rx) =
client_mailbox.bind_actor_port::<ClientMessage>();

// Bootstrap the controller
let controller_id = id!(controller[0].root);
Expand Down Expand Up @@ -1784,14 +1782,17 @@ mod tests {
// Join the world.
server_handle
.system_actor_handle()
.send(SystemMessage::Join {
proc_id: local_proc_id.clone(),
world_id,
proc_message_port: local_proc_message_port.bind(),
proc_addr: local_proc_addr,
labels: HashMap::new(),
lifecycle_mode: ProcLifecycleMode::ManagedBySystem,
})
.send(
&client_mailbox,
SystemMessage::Join {
proc_id: local_proc_id.clone(),
world_id,
proc_message_port: local_proc_message_port.bind(),
proc_addr: local_proc_addr,
labels: HashMap::new(),
lifecycle_mode: ProcLifecycleMode::ManagedBySystem,
},
)
.unwrap();

assert_matches!(
Expand Down Expand Up @@ -1865,9 +1866,8 @@ mod tests {
// Client actor.
let mut system = System::new(server_handle.local_addr().clone());
let client_mailbox = system.attach().await.unwrap();
let (client_supervision_tx, mut client_supervision_rx) =
let (_client_supervision_tx, mut client_supervision_rx) =
client_mailbox.open_port::<ClientMessage>();
client_supervision_tx.bind_to(ClientMessage::port());

// Bootstrap the controller
let controller_id = id!(controller[0].root);
Expand Down
Loading
Loading