CRC: cleanup

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stackslib/src/chainstate/nakamoto/miner.rs

@@ -536,25 +536,23 @@ impl NakamotoBlockBuilder {
             .mempool_settings
             .tenure_cost_limit_per_block_percentage
         {
-            if (1..100).contains(&percentage) {
-                let mut remaining_limit = block_limit.clone();
-                let cost_so_far = tenure_tx.cost_so_far();
-                if remaining_limit.sub(&cost_so_far).is_ok() {
-                    if remaining_limit.divide(100).is_ok() {
-                        remaining_limit.multiply(percentage.into()).expect(
-                                "BUG: failed to multiply by {percentage} when previously divided by 100",
-                            );
-                        remaining_limit.add(&cost_so_far).expect("BUG: unexpected overflow when adding cost_so_far, which was previously checked");
-                        debug!(
-                            "Setting soft limit for clarity cost to {percentage}% of remaining block limit";
-                            "remaining_limit" => %remaining_limit,
-                            "cost_so_far" => %cost_so_far,
-                            "block_limit" => %block_limit,
-                        );
-                        soft_limit = Some(remaining_limit);
-                    }
-                };
-            }
+            let mut remaining_limit = block_limit.clone();
+            let cost_so_far = tenure_tx.cost_so_far();
+            if remaining_limit.sub(&cost_so_far).is_ok() {
+                if remaining_limit.divide(100).is_ok() {
+                    remaining_limit.multiply(percentage.into()).expect(
+                        "BUG: failed to multiply by {percentage} when previously divided by 100",
+                    );
+                    remaining_limit.add(&cost_so_far).expect("BUG: unexpected overflow when adding cost_so_far, which was previously checked");
+                    debug!(
+                        "Setting soft limit for clarity cost to {percentage}% of remaining block limit";
+                        "remaining_limit" => %remaining_limit,
+                        "cost_so_far" => %cost_so_far,
+                        "block_limit" => %block_limit,
+                    );
+                    soft_limit = Some(remaining_limit);
+                }
+            };
         }
 
         builder.soft_limit = soft_limit;

testnet/stacks-node/src/config.rs

@@ -2575,7 +2575,9 @@ impl MinerConfigFile {
 
         let tenure_cost_limit_per_block_percentage =
             if let Some(percentage) = self.tenure_cost_limit_per_block_percentage {
-                if (1..=100).contains(&percentage) {
+                if percentage == 100 {
+                    None
+                } else if percentage > 0 && percentage < 100 {
                     Some(percentage)
                 } else {
                     return Err(