Merge pull request #6244 from BowTiedWoo/wasm-issue-673/assertion-failed

[clarity-wasm-tests] fix clarity_cli::test::test_samples

Author: csgui

stackslib/src/clarity_cli.rs

@@ -992,6 +992,20 @@ pub fn add_serialized_output(result: &mut serde_json::Value, value: Value) {
 
 /// Returns (process-exit-code, Option<json-output>)
 pub fn invoke_command(invoked_by: &str, args: &[String]) -> (i32, Option<serde_json::Value>) {
+    let mut store = MemoryBackingStore::new();
+    let mut analysis_db = store.as_analysis_db();
+    analysis_db.begin();
+
+    invoke_command_with_db(invoked_by, args, &mut analysis_db)
+}
+
+/// Returns (process-exit-code, Option<json-output>)
+/// Optionally accepts a shared analysis database for contract dependency resolution
+pub fn invoke_command_with_db(
+    invoked_by: &str,
+    args: &[String],
+    analysis_db: &mut AnalysisDatabase,
+) -> (i32, Option<serde_json::Value>) {
     if args.is_empty() {
         print_usage(invoked_by);
         return (1, None);
@@ -1662,12 +1676,14 @@ pub fn invoke_command(invoked_by: &str, args: &[String]) -> (i32, Option<serde_j
                                 &mut marf,
                                 coverage.as_mut(),
                                 |vm_env| {
-                                    vm_env.initialize_versioned_contract(
+                                    // Use the shared analysis database for contract initialization
+                                    vm_env.initialize_versioned_contract_with_db(
                                         contract_identifier,
                                         ClarityVersion::Clarity2,
                                         &contract_content,
                                         None,
                                         ASTRules::PrecheckSize,
+                                        analysis_db,
                                     )
                                 },
                             );
@@ -2028,15 +2044,21 @@ mod test {
         assert_eq!(exit, 0);
         assert!(!result["message"].as_str().unwrap().is_empty());
 
+        // Create a shared analysis database for contract dependency resolution
+        let mut store = MemoryBackingStore::new();
+        let mut analysis_db = store.as_analysis_db();
+        analysis_db.begin();
+
         eprintln!("launch tokens");
-        let invoked = invoke_command(
+        let invoked = invoke_command_with_db(
             "test",
             &[
                 "launch".to_string(),
                 "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(),
                 cargo_workspace_as_string("sample/contracts/tokens.clar"),
                 db_name.clone(),
             ],
+            &mut analysis_db,
         );
 
         let exit = invoked.0;
@@ -2117,7 +2139,7 @@ mod test {
         assert!(result["assets"] == json!(null));
 
         eprintln!("launch names with costs and assets");
-        let invoked = invoke_command(
+        let invoked = invoke_command_with_db(
             "test",
             &[
                 "launch".to_string(),
@@ -2127,6 +2149,7 @@ mod test {
                 "--assets".to_string(),
                 db_name.clone(),
             ],
+            &mut analysis_db,
         );
 
         let exit = invoked.0;