test: fix test_samples test

Author: BowTiedWoo

stackslib/src/clarity_cli.rs

@@ -992,6 +992,16 @@ 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>) {
+    invoke_command_with_analysis_db(invoked_by, args, None)
+}
+
+/// Returns (process-exit-code, Option<json-output>)
+/// Optionally accepts a shared analysis database for contract dependency resolution
+pub fn invoke_command_with_analysis_db(
+    invoked_by: &str,
+    args: &[String],
+    shared_analysis_db: Option<&mut AnalysisDatabase>,
+) -> (i32, Option<serde_json::Value>) {
     if args.is_empty() {
         print_usage(invoked_by);
         return (1, None);
@@ -1649,13 +1659,46 @@ pub fn invoke_command(invoked_by: &str, args: &[String]) -> (i32, Option<serde_j
             } else {
                 None
             };
-            let (_, _, analysis_result_and_cost) =
+            let (_, _, analysis_result_and_cost) = if let Some(shared_analysis_db) =
+                shared_analysis_db
+            {
+                // Use shared analysis database for contract dependency resolution
                 in_block(header_db, marf_kv, |header_db, mut marf| {
                     let analysis_result =
                         run_analysis(&contract_identifier, &mut ast, &header_db, &mut marf, true);
                     match analysis_result {
                         Err(e) => (header_db, marf, Err(e)),
-                        Ok(analysis) => {
+                        Ok(contract_analysis) => {
+                            let result_and_cost = with_env_costs(
+                                mainnet,
+                                &header_db,
+                                &mut marf,
+                                coverage.as_mut(),
+                                |vm_env| {
+                                    // Use the shared analysis database for contract initialization
+                                    vm_env.initialize_versioned_contract_with_db(
+                                        contract_identifier,
+                                        ClarityVersion::Clarity2,
+                                        &contract_content,
+                                        None,
+                                        ASTRules::PrecheckSize,
+                                        shared_analysis_db,
+                                    )
+                                },
+                            );
+                            let (result, cost) = result_and_cost;
+                            (header_db, marf, Ok((contract_analysis, (result, cost))))
+                        }
+                    }
+                })
+            } else {
+                // Original behavior without shared analysis database
+                in_block(header_db, marf_kv, |header_db, mut marf| {
+                    let analysis_result =
+                        run_analysis(&contract_identifier, &mut ast, &header_db, &mut marf, true);
+                    match analysis_result {
+                        Err(e) => (header_db, marf, Err(e)),
+                        Ok(contract_analysis) => {
                             let result_and_cost = with_env_costs(
                                 mainnet,
                                 &header_db,
@@ -1672,10 +1715,11 @@ pub fn invoke_command(invoked_by: &str, args: &[String]) -> (i32, Option<serde_j
                                 },
                             );
                             let (result, cost) = result_and_cost;
-                            (header_db, marf, Ok((analysis, (result, cost))))
+                            (header_db, marf, Ok((contract_analysis, (result, cost))))
                         }
                     }
-                });
+                })
+            };
 
             match analysis_result_and_cost {
                 Ok((contract_analysis, (Ok((_x, asset_map, events)), cost))) => {
@@ -2028,15 +2072,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_analysis_db(
             "test",
             &[
                 "launch".to_string(),
                 "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(),
                 cargo_workspace_as_string("sample/contracts/tokens.clar"),
                 db_name.clone(),
             ],
+            Some(&mut analysis_db),
         );
 
         let exit = invoked.0;
@@ -2117,7 +2167,7 @@ mod test {
         assert!(result["assets"] == json!(null));
 
         eprintln!("launch names with costs and assets");
-        let invoked = invoke_command(
+        let invoked = invoke_command_with_analysis_db(
             "test",
             &[
                 "launch".to_string(),
@@ -2127,6 +2177,7 @@ mod test {
                 "--assets".to_string(),
                 db_name.clone(),
             ],
+            Some(&mut analysis_db),
         );
 
         let exit = invoked.0;