fix: style

stacks-network · Dec 19, 2024 · 635cfe3 · 635cfe3
1 parent 0b0b821
commit 635cfe3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 33 deletions.
diff --git a/stackslib/src/config/mod.rs b/stackslib/src/config/mod.rs
@@ -2676,18 +2676,9 @@ impl MinerConfigFile {
             activated_vrf_key_path: self.activated_vrf_key_path.clone(),
             fast_rampup: self.fast_rampup.unwrap_or(miner_default_config.fast_rampup),
             underperform_stop_threshold: self.underperform_stop_threshold,
-            mempool_walk_strategy: {
-                if let Some(mempool_walk_strategy) = &self.mempool_walk_strategy {
-                    match str::parse(&mempool_walk_strategy) {
-                        Ok(strategy) => strategy,
-                        Err(e) => {
-                            panic!("could not parse '{mempool_walk_strategy}': {e}");
-                        },
-                    }
-                } else {
-                    MemPoolWalkStrategy::GlobalFeeRate
-                }
-            },
+            mempool_walk_strategy: self.mempool_walk_strategy
+                .map(|s| str::parse(&s).unwrap_or_else(|e| panic!("Could not parse '{s}': {e}")))
+                .unwrap_or(MemPoolWalkStrategy::GlobalFeeRate),
             txs_to_consider: {
                 if let Some(txs_to_consider) = &self.txs_to_consider {
                     txs_to_consider

diff --git a/stackslib/src/core/mempool.rs b/stackslib/src/core/mempool.rs
@@ -1717,10 +1717,7 @@ impl MemPoolDB {
             FROM mempool
             WHERE fee_rate IS NULL
             ";
-        let mut query_stmt_null = self
-            .db
-            .prepare(&sql)
-            .map_err(Error::SqliteError)?;
+        let mut query_stmt_null = self.db.prepare(&sql).map_err(Error::SqliteError)?;
         let mut null_iterator = query_stmt_null
             .query(NO_PARAMS)
             .map_err(Error::SqliteError)?;
@@ -1730,10 +1727,7 @@ impl MemPoolDB {
             WHERE fee_rate IS NOT NULL
             ORDER BY fee_rate DESC
             ";
-        let mut query_stmt_fee = self
-            .db
-            .prepare(&sql)
-            .map_err(Error::SqliteError)?;
+        let mut query_stmt_fee = self.db.prepare(&sql).map_err(Error::SqliteError)?;
         let mut fee_iterator = query_stmt_fee
             .query(NO_PARAMS)
             .map_err(Error::SqliteError)?;
@@ -1786,10 +1780,7 @@ impl MemPoolDB {
             ORDER BY origin_rank ASC, sponsor_rank ASC, sort_fee_rate DESC
             LIMIT 1
             ";
-        let mut query_stmt_nonce_rank = self
-            .db
-            .prepare(&sql)
-            .map_err(Error::SqliteError)?;
+        let mut query_stmt_nonce_rank = self.db.prepare(&sql).map_err(Error::SqliteError)?;
 
         let stop_reason = loop {
             if start_time.elapsed().as_millis() > settings.max_walk_time_ms as u128 {
@@ -1812,9 +1803,7 @@ impl MemPoolDB {
                                 < settings.consider_no_estimate_tx_prob;
                             // randomly select from either the null fee-rate transactions or those with fee-rate estimates.
                             let opt_tx = if start_with_no_estimate {
-                                null_iterator
-                                    .next()
-                                    .map_err(Error::SqliteError)?
+                                null_iterator.next().map_err(Error::SqliteError)?
                             } else {
                                 fee_iterator.next().map_err(Error::SqliteError)?
                             };
@@ -1825,13 +1814,9 @@ impl MemPoolDB {
                                 None => {
                                     // If the selected iterator is empty, check the other
                                     match if start_with_no_estimate {
-                                        fee_iterator
-                                            .next()
-                                            .map_err(Error::SqliteError)?
+                                        fee_iterator.next().map_err(Error::SqliteError)?
                                     } else {
-                                        null_iterator
-                                            .next()
-                                            .map_err(Error::SqliteError)?
+                                        null_iterator.next().map_err(Error::SqliteError)?
                                     } {
                                         Some(row) => (
                                             MemPoolTxInfoPartial::from_row(row)?,