collapse the "check mempool feature" checks

stacks-network · Feb 1, 2022 · b88d8ce · b88d8ce
1 parent 4be27a3
commit b88d8ce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/src/chainstate/stacks/db/blocks.rs b/src/chainstate/stacks/db/blocks.rs
@@ -5009,12 +5009,10 @@ impl StacksChainState {
             None,
         )?;
 
-        let block_limit = clarity_tx
-            .block_limit()
-            .unwrap_or_else(|| {
-                 warn!("Failed to read transaction block limit");
-                 ExecutionCost::max_value()
-            });
+        let block_limit = clarity_tx.block_limit().unwrap_or_else(|| {
+            warn!("Failed to read transaction block limit");
+            ExecutionCost::max_value()
+        });
 
         let (
             scheduled_miner_reward,

diff --git a/src/monitoring/mod.rs b/src/monitoring/mod.rs
@@ -113,19 +113,18 @@ pub fn set_last_execution_cost_observed(
     block_limit: &ExecutionCost,
 ) {
     #[cfg(feature = "monitoring_prom")]
-    prometheus::LAST_BLOCK_READ_COUNT
-        .set(execution_cost.read_count as f64 / block_limit.read_count as f64);
-    #[cfg(feature = "monitoring_prom")]
-    prometheus::LAST_BLOCK_WRITE_COUNT
-        .set(execution_cost.write_count as f64 / block_limit.read_count as f64);
-    #[cfg(feature = "monitoring_prom")]
-    prometheus::LAST_BLOCK_READ_LENGTH
-        .set(execution_cost.read_length as f64 / block_limit.read_length as f64);
-    #[cfg(feature = "monitoring_prom")]
-    prometheus::LAST_BLOCK_WRITE_LENGTH
-        .set(execution_cost.write_length as f64 / block_limit.write_length as f64);
-    #[cfg(feature = "monitoring_prom")]
-    prometheus::LAST_BLOCK_RUNTIME.set(execution_cost.runtime as f64 / block_limit.runtime as f64);
+    {
+        prometheus::LAST_BLOCK_READ_COUNT
+            .set(execution_cost.read_count as f64 / block_limit.read_count as f64);
+        prometheus::LAST_BLOCK_WRITE_COUNT
+            .set(execution_cost.write_count as f64 / block_limit.read_count as f64);
+        prometheus::LAST_BLOCK_READ_LENGTH
+            .set(execution_cost.read_length as f64 / block_limit.read_length as f64);
+        prometheus::LAST_BLOCK_WRITE_LENGTH
+            .set(execution_cost.write_length as f64 / block_limit.write_length as f64);
+        prometheus::LAST_BLOCK_RUNTIME
+            .set(execution_cost.runtime as f64 / block_limit.runtime as f64);
+    }
 }
 
 pub fn increment_btc_ops_sent_counter() {