Skip to content
Snippets Groups Projects
Verified Commit 490e38c9 authored by Eduardo Trujillo's avatar Eduardo Trujillo
Browse files

refactor: Remove dead code

parent 01190060
No related branches found
No related tags found
No related merge requests found
......@@ -8,13 +8,9 @@ use dbus::{
use nm_reactor_dbus_codegen::network_manager_connection_active::{
OrgFreedesktopNetworkManagerConnectionActive,
OrgFreedesktopNetworkManagerConnectionActiveStateChanged,
};
use super::signal::SignalStreamWrapper;
pub struct ActiveConnectionWrapper<'a> {
conn: Arc<SyncConnection>,
proxy: Box<dyn OrgFreedesktopNetworkManagerConnectionActive + Send + Sync + 'a>,
path: Path<'a>,
}
......@@ -30,11 +26,10 @@ impl<'a> ActiveConnectionWrapper<'a> {
"org.freedesktop.NetworkManager",
path.clone(),
Duration::from_millis(5000),
conn.clone(),
conn,
);
ActiveConnectionWrapper {
conn,
proxy: Box::new(proxy),
path,
}
......@@ -55,11 +50,4 @@ impl<'a> ActiveConnectionWrapper<'a> {
Ok(device_paths)
}
pub async fn state_changed_signal_stream(
&self,
) -> anyhow::Result<SignalStreamWrapper<OrgFreedesktopNetworkManagerConnectionActiveStateChanged>>
{
SignalStreamWrapper::from_match_rule(&self.conn, None, Some(self.path.clone())).await
}
}
use std::{sync::Arc, time::Duration};
use dbus::{
nonblock::{Proxy, SyncConnection},
Path,
};
use nm_reactor_dbus_codegen::network_manager_connection_active::OrgFreedesktopNetworkManagerConnectionActive;
pub struct ConnectionWrapper<'a> {
conn: Arc<SyncConnection>,
proxy: Box<dyn OrgFreedesktopNetworkManagerConnectionActive + Send + Sync + 'a>,
path: Path<'a>,
}
impl<'a> ConnectionWrapper<'a> {
pub async fn from_path<P>(conn: Arc<SyncConnection>, path: P) -> ConnectionWrapper<'a>
pub async fn from_path<P>(path: P) -> ConnectionWrapper<'a>
where
P: Into<dbus::Path<'a>>,
{
let path = path.into();
let proxy: Proxy<'a, Arc<SyncConnection>> = Proxy::new(
"org.freedesktop.NetworkManager",
path.clone(),
Duration::from_millis(5000),
conn.clone(),
);
ConnectionWrapper {
conn,
proxy: Box::new(proxy),
path,
}
}
......
......@@ -11,7 +11,6 @@ use nm_reactor_dbus_codegen::network_manager_settings::OrgFreedesktopNetworkMana
use super::connection::ConnectionWrapper;
pub struct ManagerSettingsWrapper<'a> {
conn: Arc<SyncConnection>,
proxy: Box<dyn OrgFreedesktopNetworkManagerSettings + Send + Sync + 'a>,
}
......@@ -25,7 +24,6 @@ impl<'a> ManagerSettingsWrapper<'a> {
);
ManagerSettingsWrapper {
conn: conn.clone(),
proxy: Box::new(proxy),
}
}
......@@ -40,7 +38,7 @@ impl<'a> ManagerSettingsWrapper<'a> {
return Ok(None);
}
let connection = ConnectionWrapper::from_path(self.conn.clone(), path).await;
let connection = ConnectionWrapper::from_path(path).await;
Ok(Some(connection))
}
......
......@@ -66,7 +66,7 @@ impl ConnectionIdentifier {
) -> Result<Option<ConnectionWrapper<'a>>> {
match self {
ConnectionIdentifier::ConnectionPath { connection_path } => {
let connection = ConnectionWrapper::from_path(conn.clone(), connection_path).await;
let connection = ConnectionWrapper::from_path(connection_path).await;
Ok(Some(connection))
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment