workspace

Author: allanbrondum

cargo-concordium/src/build.rs

@@ -53,7 +53,9 @@ const ENCODER: base64::engine::GeneralPurpose = general_purpose::STANDARD;
 ///
 /// Used for converting crate names, which often contain `-`, to module names,
 /// which cannot have `-`.
-fn to_snake_case(string: &str) -> String { string.replace('-', "_") }
+fn to_snake_case(string: &str) -> String {
+    string.replace('-', "_")
+}
 
 /// Get the crate's metadata either by looking for the `Cargo.toml` file at the
 /// `--manifest-path` or at the ancestors of the current directory.
@@ -114,32 +116,34 @@ impl SchemaBuildOptions {
     }
 
     /// Return whether the schema should be embedded.
-    pub fn embed(self) -> bool { matches!(self, SchemaBuildOptions::BuildAndEmbed) }
+    pub fn embed(self) -> bool {
+        matches!(self, SchemaBuildOptions::BuildAndEmbed)
+    }
 }
 
 /// Build information returned by the [`build_contract`] function.
 pub struct BuildInfo {
     /// Size of the module that was built, including custom section.
-    pub total_module_len:  usize,
+    pub total_module_len: usize,
     /// The schema, if any was built.
-    pub schema:            Option<schema::VersionedModuleSchema>,
+    pub schema: Option<schema::VersionedModuleSchema>,
     /// The metadata used for building the contract (the actual code, not the
     /// schema).
-    pub metadata:          cargo_metadata::Metadata,
+    pub metadata: cargo_metadata::Metadata,
     /// If a reproducible/verifiable build is requested, this contains the build
     /// information that should be embedded in the module, together with a
     /// list of file paths that were used to build the artifact. The file
     /// paths are relative to the package root.
     pub stored_build_info: Option<(utils::VersionedBuildInfo, Vec<PathBuf>)>,
     /// The path to the file of the built module.
-    pub out_filename:      PathBuf,
+    pub out_filename: PathBuf,
 }
 
 /// Result of [`create_archive`]. It contains the actual archive with a
 /// list of files that were included.
 pub struct TarArchiveData {
     /// The archive itself.
-    tar_archive:    Vec<u8>,
+    tar_archive: Vec<u8>,
     /// The list of files in the archive, the paths are relative to the root of
     /// the archive.
     archived_files: Vec<PathBuf>,
@@ -252,7 +256,7 @@ struct ContainerBuildOutput {
     /// The output Wasm file containing the unprocessed contract module.
     output_wasm: Vec<u8>,
     /// Information about the build so that it can be reproduced.
-    build_info:  utils::VersionedBuildInfo,
+    build_info: utils::VersionedBuildInfo,
     /// The sources that were built, archived as a tar file.
     tar_archive: TarArchiveData,
 }
@@ -261,9 +265,9 @@ struct ContainerBuildOutput {
 struct PackageData<'a> {
     /// The target directory of the package that is being
     /// built. This is used to exclude it from bundling.
-    package_target_dir:     &'a Path,
+    package_target_dir: &'a Path,
     /// The root of the package to build.
-    package_root_path:      &'a Path,
+    package_root_path: &'a Path,
     /// The package-name-version pair to mimics the behaviour or cargo package.
     /// The paths in the tar archive are
     package_version_string: &'a str,
@@ -295,13 +299,18 @@ fn build_in_container<'a>(
     tar_path: &Path,
     source_link: Option<String>,
 ) -> anyhow::Result<ContainerBuildOutput> {
-    let tar_archive = create_archive(package_root_path, package_version_string, &[
-        out_path,
-        tar_path,
-        package_target_dir,
-    ])?;
+    let tar_archive = create_archive(
+        package_root_path,
+        package_version_string,
+        &[out_path, tar_path, package_target_dir],
+    )?;
 
     let archive_hash = sha2::Sha256::digest(&tar_archive.tar_archive);
+    
+    println!("package_target_dir: {:?}", package_target_dir);
+    println!("package_root_path: {:?}", package_root_path);
+    println!("package_version_string: {:?}", package_version_string);
+    println!("tar_path: {:?}", tar_path);
 
     let build_command = [
         "cargo",
@@ -421,6 +430,12 @@ pub(crate) fn build_contract(
         .parent()
         .context("Unable to get package root path.")?;
 
+
+    println!("resolve: {:#?}", metadata.resolve.is_some());
+    println!("package: {:#?}", package.name);
+    println!("package_root: {:#?}", package_root);
+    // println!("metadata: {:#?}", metadata);p
+
     let package_root_path = package_root.canonicalize()?;
 
     let package_version_string = format!("{}-{}", package.name, package.version);
@@ -472,7 +487,7 @@ pub(crate) fn build_contract(
                 if build_schema.embed() {
                     schema_bytes = contracts_common::to_bytes(&schema);
                     let custom_section = CustomSection {
-                        name:     "concordium-schema".into(),
+                        name: "concordium-schema".into(),
                         contents: &schema_bytes,
                     };
                     Some((Some(custom_section), schema))
@@ -494,7 +509,7 @@ pub(crate) fn build_contract(
                 if build_schema.embed() {
                     schema_bytes = contracts_common::to_bytes(&schema);
                     let custom_section = CustomSection {
-                        name:     "concordium-schema".into(),
+                        name: "concordium-schema".into(),
                         contents: &schema_bytes,
                     };
                     Some((Some(custom_section), schema))
@@ -536,8 +551,8 @@ pub(crate) fn build_contract(
         } = build_in_container(
             image,
             PackageData {
-                package_target_dir:     package_target_dir.as_path(),
-                package_root_path:      package_root_path.as_path(),
+                package_target_dir: package_target_dir.as_path(),
+                package_root_path: package_root_path.as_path(),
                 package_version_string: &package_version_string,
             },
             args_without_manifest,
@@ -642,7 +657,7 @@ pub(crate) fn build_contract(
     // Embed build info section if present.
     if let Some((build_info, _)) = &stored_build_info {
         let cs = CustomSection {
-            name:     BUILD_INFO_SECTION_NAME.into(),
+            name: BUILD_INFO_SECTION_NAME.into(),
             contents: &contracts_common::to_bytes(&build_info),
         };
         write_custom_section(&mut output_bytes, &cs)?;
@@ -1347,13 +1362,11 @@ pub fn build_and_run_wasm_test(
     let target_dir = metadata.target_directory.as_std_path().join("concordium");
 
     let (mut cmd, filename) = cargo_build_cmd(extra_args, target_dir, &metadata)?;
-    cmd.arg("--features").arg(
-        if enable_debug {
-            "concordium-std/wasm-test,concordium-std/debug"
-        } else {
-            "concordium-std/wasm-test"
-        },
-    );
+    cmd.arg("--features").arg(if enable_debug {
+        "concordium-std/wasm-test,concordium-std/debug"
+    } else {
+        "concordium-std/wasm-test"
+    });
 
     // Output what we are doing so that it is easier to debug if the user
     // has their own features or options.