misc

Author: vporton

src/dfx/src/lib/builders/motoko.rs

@@ -53,6 +53,7 @@ fn get_imports(cache: &dyn Cache, info: &MotokoCanisterInfo, imports: &mut Impor
         imports: &mut ImportsTracker,
         pool: &CanisterPool,
     ) -> DfxResult {
+        println!("CanisterInfo: {:#?}", file);
         let parent = MotokoImport::Relative(file.to_path_buf());
         if imports.nodes.contains_key(&parent) {
             return Ok(());
@@ -86,13 +87,17 @@ fn get_imports(cache: &dyn Cache, info: &MotokoCanisterInfo, imports: &mut Impor
                 _ => {}
             }
             let parent_node = imports.graph.add_node(parent.clone());
-            let child_node = imports.graph.add_node(child);
+            if let MotokoImport::Relative(child) = &child {
+                println!("INSERTED CHILD: {}", child.display()); // FIXME
+            }
+                let child_node = imports.graph.add_node(child);
             imports.graph.add_edge(parent_node, child_node, ());
         }
 
         Ok(())
     }
 
+    println!("CanisterInfo2: {:#?}", info.get_main_path());
     get_imports_recursive(cache, info.get_main_path(), imports, pool)?;
 
     Ok(())
@@ -106,7 +111,9 @@ impl CanisterBuilder for MotokoBuilder {
         info: &CanisterInfo,
     ) -> DfxResult<Vec<CanisterId>> {
         let motoko_info = info.as_info::<MotokoCanisterInfo>()?;
+        println!("CanisterInfo3: {:#?}", info.get_main_file()); // FIXME
         get_imports(self.cache.as_ref(), &motoko_info, &mut *pool.imports.borrow_mut(), pool)?;
+        println!("CanisterInfo4: {:#?}", motoko_info.get_main_path()); // FIXME
 
         Ok(pool.imports.borrow().nodes
             .iter()
@@ -129,6 +136,7 @@ impl CanisterBuilder for MotokoBuilder {
         config: &BuildConfig,
     ) -> DfxResult<BuildOutput> {
         let motoko_info = canister_info.as_info::<MotokoCanisterInfo>()?;
+        println!("motoko_info: {}", motoko_info.get_main_path().display());
         let profile = config.profile;
         let input_path = motoko_info.get_main_path();
         let output_wasm_path = motoko_info.get_output_wasm_path();

src/dfx/src/lib/canister_info/motoko.rs

@@ -54,7 +54,7 @@ impl MotokoCanisterInfo {
 
 impl CanisterInfoFactory for MotokoCanisterInfo {
     fn create(info: &CanisterInfo) -> DfxResult<MotokoCanisterInfo> {
-        let workspace_root = info.get_workspace_root();
+        // let workspace_root = info.get_workspace_root(); // FIXME: Is it correct that I commented it out? // I commented it out to have consistent relative paths.
         let name = info.get_name();
         ensure!(
             matches!(info.type_specific, CanisterTypeProperties::Motoko { .. }),
@@ -64,11 +64,11 @@ impl CanisterInfoFactory for MotokoCanisterInfo {
         let main_path = info
             .get_main_file()
             .context("`main` attribute is required on Motoko canisters in dfx.json")?;
-        let input_path = workspace_root.join(main_path);
+        let input_path = main_path.to_path_buf(); // workspace_root.join(main_path);
         let output_root = info.get_output_root().to_path_buf();
         let output_wasm_path = output_root.join(name).with_extension("wasm");
         let output_idl_path = if let Some(remote_candid) = info.get_remote_candid_if_remote() {
-            workspace_root.join(remote_candid)
+            remote_candid // workspace_root.join(remote_candid)
         } else {
             output_wasm_path.with_extension("did")
         };

src/dfx/src/lib/models/canister.rs

@@ -483,6 +483,7 @@ impl CanisterPool {
             _ => None,
         };
         let info = CanisterInfo::load(pool_helper.config, canister_name, canister_id)?;
+        // println!("CanisterInfo: {:#?}", info);
         let builder = pool_helper.builder_pool.get(&info);
         pool_helper
             .canisters_map