From 973917dad24a9f170d0d1fee036ee892aeb2bcbb Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Fri, 26 Jan 2024 13:38:32 +0000 Subject: [PATCH] Refactor clone()s Signed-off-by: Nikolaos Karaolidis --- src/threads/data/asset_status.rs | 10 +++------- src/threads/data/backfill.rs | 13 ++++--------- src/threads/data/mod.rs | 20 ++++++-------------- src/threads/data/websocket.rs | 23 +++++++---------------- 4 files changed, 20 insertions(+), 46 deletions(-) diff --git a/src/threads/data/asset_status.rs b/src/threads/data/asset_status.rs index 821dea1..be79a4a 100644 --- a/src/threads/data/asset_status.rs +++ b/src/threads/data/asset_status.rs @@ -52,17 +52,13 @@ pub async fn run( >, ) { loop { - let app_config = app_config.clone(); - let guard = guard.clone(); - let websocket_sender = websocket_sender.clone(); - let message = asset_status_receiver.recv().await.unwrap(); spawn(handle_asset_status_message( - app_config, + app_config.clone(), thread_type, - guard, - websocket_sender, + guard.clone(), + websocket_sender.clone(), message, )); } diff --git a/src/threads/data/backfill.rs b/src/threads/data/backfill.rs index ae5ecb6..06fd10f 100644 --- a/src/threads/data/backfill.rs +++ b/src/threads/data/backfill.rs @@ -59,19 +59,14 @@ pub async fn run( }; loop { - let app_config = app_config.clone(); - let guard = guard.clone(); - let backfill_jobs = backfill_jobs.clone(); - let data_url = data_url.clone(); - let message = backfill_receiver.recv().await.unwrap(); spawn(handle_backfill_message( - app_config, + app_config.clone(), thread_type, - guard, - data_url, - backfill_jobs, + guard.clone(), + data_url.clone(), + backfill_jobs.clone(), message, )); } diff --git a/src/threads/data/mod.rs b/src/threads/data/mod.rs index d54a56a..4bad2f5 100644 --- a/src/threads/data/mod.rs +++ b/src/threads/data/mod.rs @@ -58,26 +58,18 @@ pub async fn run( loop { select! { Some(asset_message) = asset_receiver.recv() => { - let bars_us_equity_asset_status_sender = bars_us_equity_asset_status_sender.clone(); - let bars_crypto_asset_status_sender = bars_crypto_asset_status_sender.clone(); - let news_asset_status_sender = news_asset_status_sender.clone(); - spawn(handle_asset_message( - bars_us_equity_asset_status_sender, - bars_crypto_asset_status_sender, - news_asset_status_sender, + bars_us_equity_asset_status_sender.clone(), + bars_crypto_asset_status_sender.clone(), + news_asset_status_sender.clone(), asset_message, )); } Some(_) = clock_receiver.recv() => { - let bars_us_equity_backfill_sender = bars_us_equity_backfill_sender.clone(); - let bars_crypto_backfill_sender = bars_crypto_backfill_sender.clone(); - let news_backfill_sender = news_backfill_sender.clone(); - spawn(handle_clock_message( - bars_us_equity_backfill_sender, - bars_crypto_backfill_sender, - news_backfill_sender, + bars_us_equity_backfill_sender.clone(), + bars_crypto_backfill_sender.clone(), + news_backfill_sender.clone(), )); } else => { diff --git a/src/threads/data/websocket.rs b/src/threads/data/websocket.rs index bae568c..dd94faf 100644 --- a/src/threads/data/websocket.rs +++ b/src/threads/data/websocket.rs @@ -33,19 +33,14 @@ pub async fn run( backfill_sender: mpsc::Sender, ) { loop { - let app_config = app_config.clone(); - let guard = guard.clone(); - let websocket_sender = websocket_sender.clone(); - let backfill_sender = backfill_sender.clone(); - let message = websocket_receiver.next().await.unwrap().unwrap(); spawn(handle_websocket_message( - app_config, + app_config.clone(), thread_type, - guard, - websocket_sender, - backfill_sender, + guard.clone(), + websocket_sender.clone(), + backfill_sender.clone(), message, )); } @@ -67,15 +62,11 @@ async fn handle_websocket_message( if let Ok(message) = message { for message in message { - let app_config = app_config.clone(); - let guard = guard.clone(); - let backfill_sender = backfill_sender.clone(); - spawn(handle_parsed_websocket_message( - app_config, + app_config.clone(), thread_type, - guard, - backfill_sender, + guard.clone(), + backfill_sender.clone(), message, )); }