Merge pull request #6222 from BowTiedWoo/wasm-issue-668/no-such-contract-error

[clarity-wasm-tests] fix chainstate::stacks::boot::contract_tests

Author: csgui

clarity/src/vm/contexts.rs

@@ -735,6 +735,51 @@ impl<'a> OwnedEnvironment<'a> {
         )
     }
 
+    /// Initializes a versioned Clarity smart contract with a custom analysis database within a transaction context.
+    ///
+    /// This function should only be used for testing.
+    ///
+    /// This function creates a complete transaction environment to initialize a Clarity smart contract
+    /// using a provided memory-backed database for analysis data. It executes the contract initialization
+    /// within a proper execution context with a specific Clarity version.
+    ///
+    /// # Arguments
+    ///
+    /// * `contract_identifier` - Unique identifier for the contract (principal + contract name)
+    /// * `version` - The Clarity version to use for this contract
+    /// * `contract_content` - The raw Clarity source code as a string
+    /// * `sponsor` - Optional sponsor principal for transaction fees (if `None`, sender pays)
+    /// * `ast_rules` - Parsing rules to apply during AST construction (e.g., `ASTRules::PrecheckSize`)
+    /// * `analysis_db` - Mutable reference to a database for analysis data
+    ///
+    #[cfg(any(test, feature = "testing"))]
+    pub fn initialize_versioned_contract_with_db(
+        &mut self,
+        contract_identifier: QualifiedContractIdentifier,
+        version: ClarityVersion,
+        contract_content: &str,
+        sponsor: Option<PrincipalData>,
+        ast_rules: ASTRules,
+        analysis_db: &mut AnalysisDatabase,
+    ) -> Result<((), AssetMap, Vec<StacksTransactionEvent>)> {
+        self.execute_in_env(
+            contract_identifier.issuer.clone().into(),
+            sponsor,
+            Some(ContractContext::new(
+                QualifiedContractIdentifier::transient(),
+                version,
+            )),
+            |exec_env| {
+                exec_env.initialize_contract_with_db(
+                    contract_identifier,
+                    contract_content,
+                    ast_rules,
+                    analysis_db,
+                )
+            },
+        )
+    }
+
     pub fn initialize_contract_from_ast(
         &mut self,
         contract_identifier: QualifiedContractIdentifier,

stackslib/src/chainstate/stacks/boot/contract_tests.rs

@@ -667,33 +667,40 @@ fn pox_2_contract_caller_units() {
 
     let expected_unlock_height = POX_TESTNET_CYCLE_LENGTH * 4;
 
+    let mut store = MemoryBackingStore::new();
+    let mut analysis_db = store.as_analysis_db();
+    analysis_db.begin();
+
     // execute past 2.1 epoch initialization
     sim.execute_next_block(|_env| {});
     sim.execute_next_block(|_env| {});
     sim.execute_next_block(|_env| {});
 
     sim.execute_next_block(|env| {
-        env.initialize_versioned_contract(
+        env.initialize_versioned_contract_with_db(
             POX_2_CONTRACT_TESTNET.clone(),
             ClarityVersion::Clarity2,
             &POX_2_TESTNET_CODE,
             None,
             ASTRules::PrecheckSize,
+            &mut analysis_db,
         )
         .unwrap()
     });
 
     let cc = boot_code_id("stack-through", false);
 
     sim.execute_next_block(|env| {
-        env.initialize_contract(cc.clone(),
+        env.initialize_contract_with_db(cc.clone(),
                                 "(define-public (cc-stack-stx (amount-ustx uint)
                                                            (pox-addr (tuple (version (buff 1)) (hashbytes (buff 32))))
                                                            (start-burn-ht uint)
                                                            (lock-period uint))
                                    (contract-call? .pox-2 stack-stx amount-ustx pox-addr start-burn-ht lock-period))",
-                                None,
-                                ASTRules::PrecheckSize)
+            None,
+            ASTRules::PrecheckSize,
+            &mut analysis_db,
+        )
             .unwrap();
 
         let burn_height = env.eval_raw("burn-block-height").unwrap().0;