diff --git a/libs/protocol/src/settings.rs b/libs/protocol/src/settings.rs index 4e37af2b..a43945b0 100644 --- a/libs/protocol/src/settings.rs +++ b/libs/protocol/src/settings.rs @@ -168,7 +168,7 @@ impl PersistentSettings { self.new_sha3_miner_settings(); } if let Some(s) = self.sha3_miner.as_mut() { - s.wallet_payment_address = address.clone() + s.wallet_payment_address.clone_from(&address) } if self.mm_proxy.is_none() { diff --git a/libs/sdm-launchpad/src/resources/images/l5_mmproxy.rs b/libs/sdm-launchpad/src/resources/images/l5_mmproxy.rs index 40e05927..10eba5b8 100644 --- a/libs/sdm-launchpad/src/resources/images/l5_mmproxy.rs +++ b/libs/sdm-launchpad/src/resources/images/l5_mmproxy.rs @@ -74,7 +74,8 @@ impl ManagedContainer for MmProxy { None }); let session = &self.settings.as_ref()?.session; - self.mm_proxy = config?.settings.as_ref()?.saved_settings.mm_proxy.clone(); + self.mm_proxy + .clone_from(&config?.settings.as_ref()?.saved_settings.mm_proxy); self.mm_proxy = match config?.settings { Some(ref settings) if settings.saved_settings.mm_proxy.is_none() => { info!("No MM proxy settings found for the container configuration. Falling back on defaults."); diff --git a/libs/sdm-launchpad/src/resources/images/l5_xmrig.rs b/libs/sdm-launchpad/src/resources/images/l5_xmrig.rs index dfe60d0d..51f5f700 100644 --- a/libs/sdm-launchpad/src/resources/images/l5_xmrig.rs +++ b/libs/sdm-launchpad/src/resources/images/l5_xmrig.rs @@ -68,7 +68,7 @@ impl ManagedContainer for XMRig { self.settings = ConnectionSettings::try_extract(config?); let session = &self.settings.as_ref()?.session; - self.xmrig = config?.settings.as_ref()?.saved_settings.xmrig.clone(); + self.xmrig.clone_from(&config?.settings.as_ref()?.saved_settings.xmrig); self.xmrig.as_ref()?; Some(session.is_xmrig_active()) diff --git a/libs/sdm/src/image/task/mod.rs b/libs/sdm/src/image/task/mod.rs index e18a3d61..47b01013 100644 --- a/libs/sdm/src/image/task/mod.rs +++ b/libs/sdm/src/image/task/mod.rs @@ -33,7 +33,7 @@ use super::{checker::CheckerEvent, ManagedContainer}; use crate::{ config::ManagedProtocol, error::ParseError, - task::{RunnableContext, RunnableTask, TaskContext, TaskEvent, TaskStatusChecker}, + task::{RunnableContext, RunnableTask, TaskContext, TaskStatusChecker}, utils::TaskGuard, }; @@ -178,8 +178,6 @@ pub enum Event { CheckerProgress(CheckerEvent), } -impl TaskEvent for Event {} - impl TryFrom for Event { type Error = ParseError; diff --git a/libs/sdm/src/network/task/mod.rs b/libs/sdm/src/network/task/mod.rs index a10867e8..eab6927d 100644 --- a/libs/sdm/src/network/task/mod.rs +++ b/libs/sdm/src/network/task/mod.rs @@ -32,7 +32,7 @@ use super::ManagedNetwork; use crate::{ config::ManagedProtocol, error::ParseError, - task::{RunnableContext, RunnableTask, TaskContext, TaskEvent, TaskStatusChecker}, + task::{RunnableContext, RunnableTask, TaskContext, TaskStatusChecker}, utils::TaskGuard, }; @@ -119,8 +119,6 @@ pub enum Event { Created, } -impl TaskEvent for Event {} - impl TryFrom for Event { type Error = ParseError; diff --git a/libs/sdm/src/task.rs b/libs/sdm/src/task.rs index ba5a05e2..6220a713 100644 --- a/libs/sdm/src/task.rs +++ b/libs/sdm/src/task.rs @@ -65,7 +65,7 @@ pub trait TaskStatusChecker: fmt::Debug + Default + Send { pub trait RunnableTask: Sized + Send + 'static { type Protocol: ManagedProtocol; type Status: TaskStatusChecker; - type Event: TaskEvent; + type Event: fmt::Debug; fn name(&self) -> &str; @@ -428,5 +428,3 @@ where } } } - -pub trait TaskEvent: fmt::Debug + Send {} diff --git a/libs/sdm/src/volume/task/mod.rs b/libs/sdm/src/volume/task/mod.rs index 9a77de67..5df09d31 100644 --- a/libs/sdm/src/volume/task/mod.rs +++ b/libs/sdm/src/volume/task/mod.rs @@ -32,7 +32,7 @@ use super::ManagedVolume; use crate::{ config::ManagedProtocol, error::ParseError, - task::{RunnableContext, RunnableTask, TaskContext, TaskEvent, TaskStatusChecker}, + task::{RunnableContext, RunnableTask, TaskContext, TaskStatusChecker}, utils::TaskGuard, }; @@ -118,8 +118,6 @@ pub enum Event { Created, } -impl TaskEvent for Event {} - impl TryFrom for Event { type Error = ParseError;