refactor

Author: vporton

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

@@ -41,6 +41,22 @@ impl MotokoBuilder {
         })
     }
 
+    fn obtain_canister_maps(pool: &CanisterPool) -> (BTreeMap<String, String>, BTreeMap<String, String>) {
+        // from name to principal:
+        let id_map = pool
+            .get_canister_list()
+            .iter()
+            .map(|c| (c.get_name().to_string(), c.canister_id().to_text()))
+            .collect();
+        // from principal to name:
+        let rev_id_map = pool
+            .get_canister_list()
+            .iter()
+            .map(|c| (c.canister_id().to_text(), c.get_name().to_string()))
+            .collect();
+        (id_map, rev_id_map)
+    }
+
     /// Accomplish build given the already calculated canister dependencies
     fn do_build(
         &self,
@@ -315,29 +331,16 @@ impl CanisterBuilder for MotokoBuilder {
     ) -> DfxResult<BuildOutput> {
         let motoko_info = canister_info.as_info::<MotokoCanisterInfo>()?;
 
-        // from name to principal:
-        let id_map = pool
-            .get_canister_list()
-            .iter()
-            .map(|c| (c.get_name().to_string(), c.canister_id().to_text()))
-            .collect();
-        // from principal to name:
-        let rev_id_map: BTreeMap<String, String> = pool
-            .get_canister_list()
-            .iter()
-            .map(|c| (c.canister_id().to_text(), c.get_name().to_string()))
-            .collect();
-
-        let cache = &self.cache;
-        get_imports(cache.as_ref(), &motoko_info, &mut *pool.imports.borrow_mut(), pool)?;
+        let (id_map, rev_id_map) = Self::obtain_canister_maps(pool);
+        get_imports(self.cache.as_ref(), &motoko_info, &mut *pool.imports.borrow_mut(), pool)?;
 
         self.do_build(
             pool,
             canister_info,
             config,
             &id_map,
             &rev_id_map,
-            cache.as_ref(),
+            self.cache.as_ref(),
         )
     }