Make TimerLoop::new to return Arc<TimerLoop>

Author: Hyunsik Jeong

codechain/run_node.rs

@@ -46,7 +46,7 @@ use crate::json::PasswordFile;
 use crate::rpc::{rpc_http_start, rpc_ipc_start, rpc_ws_start};
 use crate::rpc_apis::ApiDependencies;
 
-fn network_start(timer_loop: TimerLoop, cfg: &NetworkConfig) -> Result<Arc<NetworkService>, String> {
+fn network_start(timer_loop: Arc<TimerLoop>, cfg: &NetworkConfig) -> Result<Arc<NetworkService>, String> {
     cinfo!(NETWORK, "Handshake Listening on {}:{}", cfg.address, cfg.port);
 
     let addr = cfg.address.parse().map_err(|_| format!("Invalid NETWORK listen host given: {}", cfg.address))?;

network/src/client.rs

@@ -82,7 +82,7 @@ impl Api for ClientApi {
 pub struct Client {
     extensions: RwLock<HashMap<&'static str, Arc<NetworkExtension>>>,
     p2p_channel: IoChannel<P2pMessage>,
-    timer_loop: TimerLoop,
+    timer_loop: Arc<TimerLoop>,
 }
 
 macro_rules! define_broadcast_method {
@@ -137,7 +137,7 @@ impl Client {
     }
 
     #[cfg_attr(feature = "cargo-clippy", allow(clippy::new_ret_no_self))]
-    pub fn new(p2p_channel: IoChannel<P2pMessage>, timer_loop: TimerLoop) -> Arc<Self> {
+    pub fn new(p2p_channel: IoChannel<P2pMessage>, timer_loop: Arc<TimerLoop>) -> Arc<Self> {
         Arc::new(Self {
             extensions: RwLock::new(HashMap::new()),
             p2p_channel,

network/src/service.rs

@@ -42,7 +42,7 @@ pub struct Service {
 
 impl Service {
     pub fn start(
-        timer_loop: TimerLoop,
+        timer_loop: Arc<TimerLoop>,
         address: SocketAddr,
         min_peers: usize,
         max_peers: usize,

util/timer/src/timer.rs

@@ -42,7 +42,8 @@ pub struct TimerLoop {
 }
 
 impl TimerLoop {
-    pub fn new(worker_size: usize) -> TimerLoop {
+    #[cfg_attr(feature = "cargo-clippy", allow(clippy::new_ret_no_self))]
+    pub fn new(worker_size: usize) -> Arc<Self> {
         let timers = Arc::new(RwLock::new(HashMap::new()));
         let scheduler = Arc::new(Scheduler::new());
 
@@ -56,10 +57,10 @@ impl TimerLoop {
                 .unwrap();
         }
 
-        TimerLoop {
+        Arc::new(Self {
             timers,
             scheduler,
-        }
+        })
     }
 
     pub fn new_timer<T>(&self, name: TimerName, handler: Arc<T>) -> TimerApi