Browse Source

chore: ran clippy for linting

Berke 1 year ago
parent
commit
d11192baa2

+ 13 - 14
src/charts/custom_line.rs

@@ -84,14 +84,13 @@ impl CustomLine {
     }
 
     pub fn insert_datapoint(&mut self, kline: &Kline) {
-        let buy_volume = kline.taker_buy_base_asset_volume;
-        let sell_volume: f32;
-        
-        if buy_volume != -1.0 {
-            sell_volume = kline.volume - buy_volume;
+        let buy_volume: f32 = kline.taker_buy_base_asset_volume;
+        let sell_volume: f32 = if buy_volume != -1.0 {
+            kline.volume - buy_volume
         } else {
-            sell_volume = kline.volume;
-        }
+            kline.volume
+        };
+
         self.klines_raw.insert(kline.time as i64, (kline.open, kline.high, kline.low, kline.close, buy_volume, sell_volume));
 
         self.render_start();
@@ -587,18 +586,18 @@ impl canvas::Program<Message> for CustomLine {
                     if let Some((_, kline)) = self.klines_raw.iter()
                         .find(|(time, _)| **time == rounded_timestamp as i64) {
 
-                        let tooltip_text: String;
-                        if kline.4 != -1.0 {
-                            tooltip_text = format!(
+                        
+                        let tooltip_text: String = if kline.4 != -1.0 {
+                            format!(
                                 "O: {} H: {} L: {} C: {}\nBuyV: {:.0} SellV: {:.0}",
                                 kline.0, kline.1, kline.2, kline.3, kline.4, kline.5
-                            );
+                            )
                         } else {
-                            tooltip_text = format!(
+                            format!(
                                 "O: {} H: {} L: {} C: {}\nVolume: {:.0}",
                                 kline.0, kline.1, kline.2, kline.3, kline.5
-                            );
-                        }
+                            )
+                        };
 
                         let text = canvas::Text {
                             content: tooltip_text,

+ 6 - 7
src/charts/footprint.rs

@@ -647,18 +647,17 @@ impl canvas::Program<Message> for Footprint {
                     if let Some((_, kline)) = self.data_points.iter()
                         .find(|(time, _)| **time == rounded_timestamp) {
 
-                            let tooltip_text: String;
-                            if kline.1.4 != -1.0 {
-                                tooltip_text = format!(
+                            let tooltip_text: String = if kline.1.4 != -1.0 {
+                                format!(
                                     "O: {} H: {} L: {} C: {}\nBuyV: {:.0} SellV: {:.0}",
                                     kline.1.0, kline.1.1, kline.1.2, kline.1.3, kline.1.4, kline.1.5
-                                );
+                                )
                             } else {
-                                tooltip_text = format!(
+                                format!(
                                     "O: {} H: {} L: {} C: {}\nVolume: {:.0}",
                                     kline.1.0, kline.1.1, kline.1.2, kline.1.3, kline.1.5
-                                );
-                            }
+                                )
+                            };
 
                             let text = canvas::Text {
                                 content: tooltip_text,

+ 1 - 1
src/charts/heatmap.rs

@@ -92,7 +92,7 @@ impl Heatmap {
     pub fn get_raw_trades(&mut self) -> Vec<Trade> {
         let mut trades_source = vec![];
 
-        for (_, (_, trades)) in &self.data_points {
+        for (_, trades) in self.data_points.values() {
             trades_source.extend(trades.iter().cloned());
         }
 

+ 6 - 10
src/data_providers/binance/market_data.rs

@@ -114,23 +114,19 @@ impl Depth {
         for order in new_bids {
             if order.qty == 0.0 {
                 self.bids.retain(|x| x.price != order.price);
-            } else {
-                if let Some(existing_order) = self.bids.iter_mut().find(|x| x.price == order.price) {
+            } else if let Some(existing_order) = self.bids.iter_mut().find(|x| x.price == order.price) {
                     existing_order.qty = order.qty;
-                } else {
-                    self.bids.push(*order);
-                }
+            } else {
+                self.bids.push(*order);
             }
         }
         for order in new_asks {
             if order.qty == 0.0 {
                 self.asks.retain(|x| x.price != order.price);
+            } else if let Some(existing_order) = self.asks.iter_mut().find(|x| x.price == order.price) {
+                existing_order.qty = order.qty;
             } else {
-                if let Some(existing_order) = self.asks.iter_mut().find(|x| x.price == order.price) {
-                    existing_order.qty = order.qty;
-                } else {
-                    self.asks.push(*order);
-                }
+                self.asks.push(*order);
             }
         }
     }

+ 8 - 12
src/data_providers/bybit/market_data.rs

@@ -86,23 +86,19 @@ impl Depth {
         for order in new_bids {
             if order.qty == 0.0 {
                 self.bids.retain(|x| x.price != order.price);
+            } else if let Some(existing_order) = self.bids.iter_mut().find(|x| x.price == order.price) {
+                existing_order.qty = order.qty;
             } else {
-                if let Some(existing_order) = self.bids.iter_mut().find(|x| x.price == order.price) {
-                    existing_order.qty = order.qty;
-                } else {
-                    self.bids.push(*order);
-                }
+                self.bids.push(*order);
             }
         }
         for order in new_asks {
             if order.qty == 0.0 {
                 self.asks.retain(|x| x.price != order.price);
+            } else if let Some(existing_order) = self.asks.iter_mut().find(|x| x.price == order.price) {
+                existing_order.qty = order.qty;
             } else {
-                if let Some(existing_order) = self.asks.iter_mut().find(|x| x.price == order.price) {
-                    existing_order.qty = order.qty;
-                } else {
-                    self.asks.push(*order);
-                }
+                self.asks.push(*order);
             }
         }
     }
@@ -746,8 +742,8 @@ pub async fn fetch_ticksize(ticker: Ticker) -> Result<f32> {
             let tick_size_str: &str = price_filter.get("tickSize").context("Tick size not found")?.as_str()
                 .context("Tick size is not a string")?;
 
-            return Ok(tick_size_str.parse::<f32>()
-                .context("Failed to parse tick size")?);
+            return tick_size_str.parse::<f32>()
+                .context("Failed to parse tick size");
         }
     }