performed cleanup of network manager
This commit is contained in:
parent
14a8ed4dac
commit
a31aa95d2b
|
|
@ -34,11 +34,8 @@ mod network_manager;
|
|||
|
||||
pub(crate) use connection::{Connection, ConnectionMessage, ConnectionOuput};
|
||||
pub(crate) use connection_initiator::{ConnectionInitiator, InitiatorOutput};
|
||||
use listener::{ListenerMessage, ListenerOutput, NetworkListener};
|
||||
// use listener::{ListenerMessage, ListenerOutput, NetworkListener};
|
||||
pub(crate) use network_manager::{
|
||||
NetworkManager,
|
||||
NetworkDataMessage, NetworkDataOutput, NetworkManager, NetworkMessage,
|
||||
NetworkOutput,
|
||||
NetworkMessage,
|
||||
NetworkDataMessage,
|
||||
NetworkDataOutput
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
use actix::{Actor, Addr, WeakRecipient};
|
||||
use crate::network::network_manager::messages::NetworkOutput;
|
||||
use crate::network::NetworkManager;
|
||||
use actix::{Actor, Addr, WeakRecipient};
|
||||
|
||||
pub struct Builder {
|
||||
pub(super) port: Option<u16>,
|
||||
pub(super) delegate: WeakRecipient<NetworkOutput>,
|
||||
}
|
||||
|
||||
impl Builder {
|
||||
pub(super) fn new(delegate: WeakRecipient<NetworkOutput>) -> Self {
|
||||
Self {
|
||||
port: None,
|
||||
delegate,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn port(mut self, port: u16) -> Self {
|
||||
self.port = Some(port);
|
||||
self
|
||||
Self { delegate }
|
||||
}
|
||||
|
||||
pub fn build(self) -> Addr<NetworkManager> {
|
||||
NetworkManager::from(self).start()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
|
||||
#[derive(Debug)]
|
||||
pub(super) struct Config {
|
||||
pub(super) port: u16,
|
||||
}
|
||||
|
|
@ -5,9 +5,9 @@
|
|||
mod builder;
|
||||
mod messages;
|
||||
mod network_manager;
|
||||
mod config;
|
||||
|
||||
use config::*;
|
||||
pub(crate) use network_manager::{NetworkManager};
|
||||
pub(crate) use builder::*;
|
||||
pub(crate) use messages::{NetworkMessage, NetworkOutput, NetworkDataMessage, NetworkDataOutput};
|
||||
pub(crate) use messages::{
|
||||
NetworkDataMessage, NetworkDataOutput, NetworkMessage, NetworkOutput,
|
||||
};
|
||||
pub(crate) use network_manager::NetworkManager;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
use crate::config_manager::{
|
||||
ConfigManager, ConfigManagerDataMessage, ConfigManagerDataResponse,
|
||||
ConfigValue,
|
||||
};
|
||||
use crate::config_manager::{ConfigManager, ConfigManagerDataMessage};
|
||||
use crate::network::listener::NetworkListener;
|
||||
use crate::network::listener::{ListenerMessage, ListenerOutput};
|
||||
use crate::network::network_manager::config::Config;
|
||||
|
||||
use crate::network::network_manager::messages::{
|
||||
NetworkMessage, NetworkOutput,
|
||||
};
|
||||
|
|
@ -24,7 +21,6 @@ use foundation::ClientDetails;
|
|||
/// this struct will handle all networking functionality.
|
||||
///
|
||||
pub struct NetworkManager {
|
||||
config: Config,
|
||||
config_manager: WeakAddr<ConfigManager>,
|
||||
listener_addr: Option<Addr<NetworkListener>>,
|
||||
delegate: WeakRecipient<NetworkOutput>,
|
||||
|
|
@ -34,7 +30,6 @@ pub struct NetworkManager {
|
|||
impl NetworkManager {
|
||||
pub fn new(delegate: WeakRecipient<NetworkOutput>) -> Addr<NetworkManager> {
|
||||
NetworkManager {
|
||||
config: Config { port: 5600 },
|
||||
listener_addr: None,
|
||||
delegate,
|
||||
initiators: Vec::new(),
|
||||
|
|
@ -190,7 +185,7 @@ impl Handler<NetworkDataMessage> for NetworkManager {
|
|||
fn handle(
|
||||
&mut self,
|
||||
msg: NetworkDataMessage,
|
||||
ctx: &mut Self::Context,
|
||||
_ctx: &mut Self::Context,
|
||||
) -> Self::Result {
|
||||
match msg {
|
||||
NetworkDataMessage::IsListening => {
|
||||
|
|
@ -234,9 +229,6 @@ impl Handler<InitiatorOutput> for NetworkManager {
|
|||
impl From<Builder> for NetworkManager {
|
||||
fn from(builder: Builder) -> Self {
|
||||
Self {
|
||||
config: Config {
|
||||
port: builder.port.unwrap_or_else(|| 5600),
|
||||
},
|
||||
listener_addr: None,
|
||||
delegate: builder.delegate,
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue