Merge pull request #20 from picklerick2349/master

chore: tidy-up code @picklerick2349

Author: anoushk1234

tinydancer/src/macros.rs

@@ -19,21 +19,18 @@ macro_rules! block_on {
 macro_rules! try_coerce_shred {
     ($response:expr) => {{
         let shred = if let Some(response) = $response.clone() {
-            let shred = match (response.shred_data, response.shred_code) {
-                (Some(data_shred), None) => {
-                    Some(Shred::ShredData(data_shred))
-                    // Some(data_shred. ().expect("num data shreds error"))
-                }
+            match (response.shred_data, response.shred_code) {
+                (Some(data_shred), None) => Some(Shred::ShredData(data_shred)),
                 (None, Some(coding_shred)) => Some(Shred::ShredCode(coding_shred)),
                 _ => None,
-            };
-            shred
+            }
         } else {
             None
         };
         shred
     }};
 }
+
 #[macro_export]
 macro_rules! send_rpc_call {
     ($url:expr, $body:expr) => {{

tinydancer/src/sampler.rs

@@ -112,10 +112,9 @@ impl ClientService<SampleServiceConfig> for SampleService {
             }
         });
 
-        let sample_indices: Vec<u64> = Vec::default();
         Self {
             sampler_handle,
-            sample_indices,
+            sample_indices: Vec::default(),
         }
     }
 
@@ -330,7 +329,7 @@ async fn shred_update_loop(
         {
             let mut status = status_sampler.lock().unwrap();
             if let ClientStatus::Crashed(_) = &*status { 
-                return Err(anyhow!(""));
+                return Err(anyhow!("Client crashed"));
             } else {
                 *status = ClientStatus::Active(String::from(
                     "Monitoring Tinydancer: Actively Sampling Shreds",

tinydancer/src/tinydancer.rs

@@ -103,21 +103,15 @@ impl TinyDancer {
             db_instance: db.clone(),
         });
 
-        let ui_service = if enable_ui_service {
-            Some(UiService::new(UiConfig {
-                client_status,
-                enable_ui_service,
-                tui_monitor,
-            }))
-        } else if tui_monitor {
+        let ui_service = if enable_ui_service || tui_monitor {
             Some(UiService::new(UiConfig {
                 client_status,
                 enable_ui_service,
                 tui_monitor,
             }))
         } else {
             None
-        };
+        };        
 
         // run
         sample_service