Gate debug_asserts with compile feature

near · Apr 3, 2023 · 2b79110 · 2b79110
1 parent 97e4147
commit 2b79110
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/core/primitives/src/runtime/parameter_table.rs b/core/primitives/src/runtime/parameter_table.rs
@@ -96,6 +96,10 @@ impl TryFrom<&ParameterValue> for ParameterCost {
     fn try_from(value: &ParameterValue) -> Result<Self, Self::Error> {
         match value {
             ParameterValue::ParameterCost { gas, compute } => {
+                if !cfg!(feature = "protocol_feature_compute_costs") {
+                    debug_assert_eq!(compute, gas, "Compute cost must match gas cost");
+                }
+
                 Ok(ParameterCost { gas: *gas, compute: *compute })
             }
             // If not specified, compute costs default to gas costs.

diff --git a/runtime/runtime/src/lib.rs b/runtime/runtime/src/lib.rs
@@ -1283,10 +1283,12 @@ impl Runtime {
                 safe_add_compute(total_compute_usage, outcome_with_id.outcome.compute_usage)?;
 
             // TODO(#8032): Remove when compute costs are stabilized.
-            debug_assert_eq!(
-                total_compute_usage, total_gas_burnt,
-                "Compute usage must match burnt gas"
-            );
+            if !cfg!(feature = "protocol_feature_compute_costs") {
+                debug_assert_eq!(
+                    total_compute_usage, total_gas_burnt,
+                    "Compute usage must match burnt gas"
+                );
+            }
 
             outcomes.push(outcome_with_id);
         }
@@ -1326,10 +1328,12 @@ impl Runtime {
                 *total_compute_usage =
                     safe_add_compute(*total_compute_usage, outcome_with_id.outcome.compute_usage)?;
                 // TODO(#8032): Remove when compute costs are stabilized.
-                debug_assert_eq!(
-                    total_compute_usage, total_gas_burnt,
-                    "Compute usage must match burnt gas"
-                );
+                if !cfg!(feature = "protocol_feature_compute_costs") {
+                    debug_assert_eq!(
+                        total_compute_usage, total_gas_burnt,
+                        "Compute usage must match burnt gas"
+                    );
+                }
                 outcomes.push(outcome_with_id);
             }
             Ok(())