refactor

Author: vporton

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

@@ -47,15 +47,16 @@ impl MotokoBuilder {
         pool: &CanisterPool,
         canister_info: &CanisterInfo,
         config: &BuildConfig,
-        motoko_info: &MotokoCanisterInfo,
         id_map: &BTreeMap<String, String>, // TODO: I feel that this variable should not be here.
         rev_id_map: &BTreeMap<String, String>, // TODO: I feel that this variable should not be here.
         cache: &dyn Cache,
     ) -> DfxResult<BuildOutput> {
-        let output_wasm_path = motoko_info.get_output_wasm_path();
-
+        let motoko_info = canister_info.as_info::<MotokoCanisterInfo>()?;
         let input_path = motoko_info.get_main_path();
         let profile = config.profile;
+
+        let output_wasm_path = motoko_info.get_output_wasm_path();
+
         let package_arguments =
             package_arguments::load(cache, motoko_info.get_packtool())?;
         let mut package_arguments_map = BTreeMap::<String, String>::new(); // TODO: Can we deal without cloning strings?
@@ -334,7 +335,6 @@ impl CanisterBuilder for MotokoBuilder {
             pool,
             canister_info,
             config,
-            &motoko_info,
             &id_map,
             &rev_id_map,
             cache.as_ref(),