Clippy fixes.

Author: kukabi

subvt-persistence/src/postgres/network/report/era.rs

@@ -32,15 +32,16 @@ impl PostgreSQLNetworkStorage {
             .bind(era_index as i64)
             .fetch_one(&self.connection_pool)
             .await?;
-        let maybe_era = if era_report.0.is_some() & era_report.1.is_some() {
-            Some(Era {
-                index: era_index,
-                start_timestamp: era_report.0.unwrap() as u64,
-                end_timestamp: era_report.1.unwrap() as u64,
-            })
-        } else {
-            None
-        };
+        let maybe_era =
+            if let (Some(era_report_0), Some(era_report_1)) = (era_report.0, era_report.1) {
+                Some(Era {
+                    index: era_index,
+                    start_timestamp: era_report_0 as u64,
+                    end_timestamp: era_report_1 as u64,
+                })
+            } else {
+                None
+            };
         if let Some(era) = maybe_era {
             Ok(Some(EraReport {
                 era,

subvt-persistence/src/postgres/network/report/era_validator.rs

@@ -58,11 +58,14 @@ impl PostgreSQLNetworkStorage {
             .bind(validator_account_id_hex_string)
             .fetch_one(&self.connection_pool)
             .await?;
-        let maybe_era = if era_validator_report.0.is_some() & era_validator_report.1.is_some() {
+
+        let maybe_era = if let (Some(era_validator_report_0), Some(era_validator_report_1)) =
+            (era_validator_report.0, era_validator_report.1)
+        {
             Some(Era {
                 index: era_index,
-                start_timestamp: era_validator_report.0.unwrap() as u64,
-                end_timestamp: era_validator_report.1.unwrap() as u64,
+                start_timestamp: era_validator_report_0 as u64,
+                end_timestamp: era_validator_report_1 as u64,
             })
         } else {
             None

subvt-plotter/src/plotlib/components/axis.rs

@@ -75,7 +75,7 @@ impl AxisTick {
 
     /// Render the axis tick to svg.
     pub fn to_svg(&self) -> Result<Group, String> {
-        let formatted_label = if self.label_format.is_some() {
+        let formatted_label = if let Some(label_format) = &self.label_format {
             let formatter = NumberFormat::new();
             formatter
                 .format(

subvt-session-validator-performance-updater/src/lib.rs

@@ -86,11 +86,10 @@ impl SessionValidatorPerformanceUpdater {
                 let attestation_count = (votes_summary.implicit + votes_summary.explicit) as u64;
                 let total_attestation_slots =
                     (votes_summary.implicit + votes_summary.explicit + votes_summary.missed) as u64;
-                let attestations_per_billion = if total_attestation_slots > 0 {
-                    attestation_count * 1_000_000_000 / total_attestation_slots
-                } else {
-                    0
-                };
+
+                let attestations_per_billion = (attestation_count * 1_000_000_000)
+                    .checked_div(total_attestation_slots)
+                    .unwrap_or(0);
                 performance.attestations_per_billion = Some(attestations_per_billion as u32);
             }
             session_validator_performances.push(performance);

subvt-substrate-client/src/lib.rs

@@ -927,21 +927,21 @@ impl SubstrateClient {
             let average_stake = era_stakers.average_stake();
             for validator in validator_map.values_mut() {
                 validator.return_rate_per_billion = if validator.is_active {
-                    if validator.validator_stake.is_none() {
+                    if let Some(validator_stake) = validator.validator_stake.as_ref() {
+                        let return_rate = (average_stake * total_return_rate_per_billion
+                            / validator_stake.total_stake)
+                            * (1_000_000_000
+                                - (validator.preferences.commission_per_billion as u128))
+                            / 1_000_000_000;
+                        Some(return_rate as u32)
+                    } else {
                         validator.validator_stake = Some(ValidatorStake {
                             account: validator.account.clone(),
                             self_stake: 0,
                             total_stake: 0,
                             nominators: Vec::new(),
                         });
                         Some(0)
-                    } else {
-                        let return_rate = (average_stake * total_return_rate_per_billion
-                            / validator.validator_stake.as_ref().unwrap().total_stake)
-                            * (1_000_000_000
-                                - (validator.preferences.commission_per_billion as u128))
-                            / 1_000_000_000;
-                        Some(return_rate as u32)
                     }
                 } else {
                     None