diff --git a/server/src/network/connection_initiator/mod.rs b/server/src/network/connection_initiator/mod.rs index 92d4e2a..a7e4c14 100644 --- a/server/src/network/connection_initiator/mod.rs +++ b/server/src/network/connection_initiator/mod.rs @@ -1,14 +1,7 @@ use std::net::SocketAddr; use actix::{ - Actor, - ActorContext, - Addr, - AsyncContext, - Context, - Handler, - Message, - Recipient, + Actor, ActorContext, Addr, AsyncContext, Context, Handler, Message, WeakRecipient, }; use foundation::{ @@ -25,12 +18,6 @@ use crate::{ prelude::messages::ObservableMessage, }; -#[derive(Debug, Clone, Copy)] -enum ConnectionPhase { - Started, - Requested, -} - #[derive(Message)] #[rtype(result = "()")] pub(crate) enum InitiatorOutput { @@ -65,13 +52,11 @@ impl ConnectionInitiator { &mut self, sender: Addr, ctx: &mut ::Context, - address: SocketAddr, + _address: SocketAddr, data: String, ) { use InitiatorOutput::{ClientRequest, InfoRequest}; use NetworkSockIn::{Connect, Info}; - use NetworkSockOut::{Connecting, GotInfo}; - use ObservableMessage::Unsubscribe; let msg = from_str::(data.as_str()); if let Err(e) = msg.as_ref() { @@ -155,8 +140,8 @@ impl Handler for ConnectionInitiator { msg: ConnectionOuput, ctx: &mut Self::Context, ) -> Self::Result { - use ConnectionOuput::{ConnectionClosed, RecvData}; - use ConnectionPhase::Requested; + use ConnectionOuput::RecvData; + if let RecvData(sender, addr, data) = msg { self.handle_request(sender, ctx, addr, data) }