Merge pull request #6169 from BowTiedWoo/feat/clarity-wasm-undefined-variable-fix

Skip Version-Incompatible Clarity Tests to Prevent UndefinedVariable Errors

Author: csgui

clarity/src/vm/tests/contracts.rs

@@ -294,6 +294,12 @@ fn tx_sponsor_contract_asserts(env: &mut Environment, sponsor: Option<PrincipalD
 
 #[apply(test_epochs)]
 fn test_tx_sponsor(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator) {
+    // Skip this test for Epoch20 and Epoch2_05, Clarity2 is not available.
+    // `tx-sponsor?` is not available in Clarity1.
+    if epoch < StacksEpochId::Epoch21 {
+        return;
+    }
+
     let mut owned_env = env_factory.get_env(epoch);
 
     let contract_a = "(define-read-only (get-sponsor)

clarity/src/vm/tests/variables.rs

@@ -54,6 +54,10 @@ fn test_block_height(
             CheckErrors::UndefinedVariable("block-height".to_string()),
             err.err
         );
+        // Return early if the ClarityVersion is Clarity3, as `block-height`
+        // is not available in Clarity3. Initializing the contract will throw
+        // UndefinedVariable error and fail the test for expected behaviour.
+        return;
     } else {
         assert!(analysis.is_ok());
     }
@@ -112,6 +116,11 @@ fn test_stacks_block_height(
             CheckErrors::UndefinedVariable("stacks-block-height".to_string()),
             err.err
         );
+        // Return early if the ClarityVersion is not Clarity3, as
+        // `stacks-block-height` is available only in Clarity3. Initializing
+        // the contract will throw UndefinedVariable error and fail the test
+        // for expected behaviour.
+        return;
     } else {
         assert!(analysis.is_ok());
     }
@@ -172,6 +181,11 @@ fn test_tenure_height(
             CheckErrors::UndefinedVariable("tenure-height".to_string()),
             err.err
         );
+        // Return early if the ClarityVersion is not Clarity3, as
+        // `tenure-height` is available only in Clarity3. Initializing the
+        // contract will throw UndefinedVariable error and fail the test for
+        // expected behaviour.
+        return;
     } else {
         assert!(analysis.is_ok());
     }