chore: Remove extra field from config

e2e/assets/error_context/dfx.json

@@ -9,7 +9,8 @@
       "main": "main.mo"
     },
     "npm_missing": {
-      "type": "assets"
+      "type": "assets",
+      "source": []
     },
     "asset_bad_source_path": {
       "type": "assets",

e2e/tests-dfx/build.bash

@@ -118,10 +118,16 @@ teardown() {
 
 @test "build fails if canister type is not supported" {
   dfx_start
-  dfx config canisters.e2e_project_backend.type unknown_canister_type
   dfx canister create --all
+  # shellcheck disable=SC2094
+  cat <<<"$(jq '.canisters.e2e_project.type="unknown_canister_type"' dfx.json)" >dfx.json
   assert_command_fail dfx build
-  assert_match "Cannot find builder for canister"
+  # shellcheck disable=SC2016
+  assert_match 'unknown variant `unknown_canister_type`'
+
+  # If canister type is invalid, `dfx stop` fails
+  # shellcheck disable=SC2094
+  cat <<<"$(jq '.canisters.e2e_project.type="motoko"' dfx.json)" >dfx.json
 }
 
 @test "can build a custom canister type" {

e2e/tests-dfx/config.bash

@@ -5,7 +5,7 @@ load ../utils/_
 setup() {
     standard_setup
 
-    dfx_new
+    dfx_new_rust
 }
 
 teardown() {
@@ -18,15 +18,15 @@ teardown() {
 
     assert_command dfx config canisters.e2e_project_backend.type
     # shellcheck disable=SC2154
-    assert_eq '"motoko"' "$stdout"
+    assert_eq '"rust"' "$stdout"
 
-    assert_command dfx config canisters.e2e_project_backend.type "rust"
+    assert_command dfx config canisters.e2e_project_backend.type "motoko"
     # shellcheck disable=SC2154
     assert_eq "" "$stdout"
 
     assert_command dfx config canisters.e2e_project_backend.type
     # shellcheck disable=SC2154
-    assert_eq '"rust"' "$stdout"
+    assert_eq '"motoko"' "$stdout"
 
     assert_command_fail dfx config non_existent
 

src/dfx/Cargo.toml

@@ -28,6 +28,7 @@ anyhow = "1.0.56"
 argon2 = "0.4.0"
 atty = "0.2.13"
 base64 = "0.13.0"
+byte-unit = { version = "4.0.14", features = ["serde"] }
 candid = { version = "0.7.10", features = [ "random" ] }
 clap = { version = "3.1.6", features = [ "derive" ] }
 console = "0.15.0"
@@ -41,14 +42,15 @@ fn-error-context = "0.2.0"
 futures = "0.3.21"
 garcon = { version = "0.2", features = ["async"] }
 hex = {version = "0.4.2", features = ["serde"] }
+humantime = "2.1.0"
+humantime-serde = "1.1.1"
 ic-types = "0.3.0"
 ic-wasm = { version = "0.1.3", default-features = false, features = ["optimize"]}
 indicatif = "0.16.0"
 itertools = "0.10.3"
 lazy-init = "0.5.0"
 lazy_static = "1.4.0"
 libflate = "1.1.2"
-humanize-rs = "0.1.5"
 mime = "0.3.16"
 mime_guess = "2.0.4"
 mockall = "0.11.0"

src/dfx/src/commands/canister/sign.rs

@@ -15,7 +15,6 @@ use ic_types::principal::Principal;
 
 use anyhow::{anyhow, bail, Context};
 use clap::Parser;
-use humanize_rs::duration;
 use slog::info;
 use time::OffsetDateTime;
 
@@ -130,7 +129,7 @@ pub async fn exec(
         .get_selected_identity_principal()
         .expect("Selected identity not instantiated.");
 
-    let timeout = duration::parse(&opts.expire_after)
+    let timeout = humantime::parse_duration(&opts.expire_after)
         .map_err(|_| anyhow!("Cannot parse expire_after as a duration (e.g. `1h`, `1h 30m`)"))?;
     //let timeout = Duration::from_secs(opts.expire_after);
     let expiration_system_time = SystemTime::now()

src/dfx/src/commands/deploy.rs

@@ -163,14 +163,13 @@ fn display_urls(env: &dyn Environment) -> DfxResult {
             };
             if let Some(canister_id) = canister_id {
                 let canister_info = CanisterInfo::load(&config, canister_name, Some(canister_id))?;
-                let is_frontend = canister_config.extras.get("frontend").is_some();
 
-                if is_frontend {
+                if canister_config.frontend.is_some() {
                     let url = construct_frontend_url(network, &canister_id)?;
                     frontend_urls.insert(canister_name, url);
                 }
 
-                if canister_info.get_type() != "assets" {
+                if !canister_info.is_assets() {
                     let url = construct_ui_canister_url(network, &canister_id, ui_canister_id)?;
                     if let Some(ui_canister_url) = url {
                         candid_urls.insert(canister_name, ui_canister_url);

src/dfx/src/commands/generate.rs

@@ -41,7 +41,7 @@ pub fn exec(env: &dyn Environment, opts: GenerateOpts) -> DfxResult {
         let canister_name = canister.get_name();
         let canister_id = store.get(canister_name)?;
         if let Some(info) = canister_pool.get_canister_info(&canister_id) {
-            if info.get_type() == "motoko" {
+            if info.is_motoko() {
                 build_before_generate = true;
             }
         }

src/dfx/src/commands/language_service.rs

@@ -7,6 +7,7 @@ use crate::lib::package_arguments::{self, PackageArguments};
 use anyhow::{anyhow, bail, Context};
 use clap::Parser;
 use fn_error_context::context;
+use std::path::PathBuf;
 use std::process::Stdio;
 
 const CANISTER_ARG: &str = "canister";
@@ -47,7 +48,7 @@ pub fn exec(env: &dyn Environment, opts: LanguageServiceOpts) -> DfxResult {
 }
 
 #[context("Failed to determine main path.")]
-fn get_main_path(config: &ConfigInterface, canister_name: Option<String>) -> DfxResult<String> {
+fn get_main_path(config: &ConfigInterface, canister_name: Option<String>) -> DfxResult<PathBuf> {
     // TODO try and point at the actual dfx.json path
     let dfx_json = CONFIG_FILE_NAME;
 
@@ -80,24 +81,20 @@ fn get_main_path(config: &ConfigInterface, canister_name: Option<String>) -> Dfx
                 }
             }
         }?;
-
-    canister
-        .extras
-        .get("main")
-        .and_then(|v| v.as_str())
-        .ok_or_else(|| {
-            error_invalid_data!(
-                "Canister {0} lacks a 'main' element in {1}",
-                canister_name,
-                dfx_json
-            )
-        })
-        .map(|s| s.to_owned())
+    if let Some(main) = canister.main {
+        Ok(main)
+    } else {
+        Err(error_invalid_data!(
+            "Canister {0} lacks a 'main' element in {1}",
+            canister_name,
+            dfx_json
+        ))
+    }
 }
 
 fn run_ide(
     env: &dyn Environment,
-    main_path: String,
+    main_path: PathBuf,
     package_arguments: PackageArguments,
 ) -> DfxResult {
     let output = env

src/dfx/src/commands/remote/generate_binding.rs

@@ -7,7 +7,6 @@ use crate::util::check_candid_file;
 use anyhow::Context;
 use clap::Parser;
 use slog::info;
-use std::path::Path;
 
 /// Generate bindings for remote canisters from their .did declarations
 #[derive(Parser)]
@@ -43,11 +42,9 @@ pub fn exec(env: &dyn Environment, opts: GenerateBindingOpts) -> DfxResult {
     for canister in canister_pool.get_canister_list() {
         let info = canister.get_info();
         if let Some(candid) = info.get_remote_candid() {
-            let main_optional: Option<String> = info.get_extra_optional("main")?;
+            let main_optional = info.get_main_file();
             if let Some(main) = main_optional {
-                let main_path = Path::new(&main);
-                let candid_path = Path::new(&candid);
-                if !candid_path.exists() {
+                if !candid.exists() {
                     info!(
                         log,
                         "Candid file {} for canister {} does not exist. Skipping.",
@@ -56,55 +53,53 @@ pub fn exec(env: &dyn Environment, opts: GenerateBindingOpts) -> DfxResult {
                     );
                     continue;
                 }
-                if main_path.exists() {
+                if main.exists() {
                     if opts.overwrite {
                         info!(
                             log,
                             "Overwriting main file {} of canister {}.",
-                            main,
+                            main.display(),
                             canister.get_name()
                         );
                     } else {
                         info!(
                             log,
                             "Main file {} of canister {} already exists. Skipping. Use --overwrite if you want to re-create it.",
-                            main,
+                            main.display(),
                             canister.get_name()
                         );
                         continue;
                     }
                 }
-                let (type_env, did_types) = check_candid_file(candid_path)?;
-                let bindings = if main.ends_with(&".mo") {
+                let (type_env, did_types) = check_candid_file(&candid)?;
+                let extension = main.extension().unwrap_or_default();
+                let bindings = if extension == "mo" {
                     Some(candid::bindings::motoko::compile(&type_env, &did_types))
-                } else if main.ends_with(&".rs") {
+                } else if extension == "rs" {
                     Some(candid::bindings::rust::compile(&type_env, &did_types))
-                } else if main.ends_with(&".js") {
+                } else if extension == "js" {
                     Some(candid::bindings::javascript::compile(&type_env, &did_types))
-                } else if main.ends_with(&".ts") {
+                } else if extension == "ts" {
                     Some(candid::bindings::typescript::compile(&type_env, &did_types))
                 } else {
                     info!(
                         log,
                         "Unsupported filetype found in {}.main: {}. Use one of the following: .mo, .rs, .js, .ts",
                         canister.get_name(),
-                        main
+                        main.display()
                     );
                     None
                 };
 
                 if let Some(bindings_string) = bindings {
-                    std::fs::write(&main_path, &bindings_string).with_context(|| {
-                        format!(
-                            "Failed to write bindings to {}.",
-                            main_path.to_string_lossy()
-                        )
+                    std::fs::write(&main, &bindings_string).with_context(|| {
+                        format!("Failed to write bindings to {}.", main.display())
                     })?;
                     info!(
                         log,
                         "Generated {} using {} for canister {}.",
-                        main,
-                        candid.to_string_lossy(),
+                        main.display(),
+                        candid.display(),
                         canister.get_name()
                     )
                 }