Use cargo check for contract check

src/cmd/build.rs

@@ -125,6 +125,7 @@ impl CheckCommand {
 /// To disable this and use the original `Cargo.toml` as is then pass the `-Z original_manifest` flag.
 fn build_cargo_project(
     crate_metadata: &CrateMetadata,
+    build_artifact: BuildArtifacts,
     verbosity: Option<Verbosity>,
     unstable_flags: UnstableFlags,
 ) -> Result<()> {
@@ -139,19 +140,20 @@ fn build_cargo_project(
 
     let cargo_build = |manifest_path: &ManifestPath| {
         let target_dir = &crate_metadata.target_directory;
-        util::invoke_cargo(
-            "build",
-            &[
-                "--target=wasm32-unknown-unknown",
-                "-Zbuild-std",
-                "-Zbuild-std-features=panic_immediate_abort",
-                "--no-default-features",
-                "--release",
-                &format!("--target-dir={}", target_dir.to_string_lossy()),
-            ],
-            manifest_path.directory(),
-            verbosity,
-        )?;
+        let mut args = [
+            "--target=wasm32-unknown-unknown",
+            "-Zbuild-std",
+            "-Zbuild-std-features=panic_immediate_abort",
+            "--no-default-features",
+            "--release",
+            &format!("--target-dir={}", target_dir.to_string_lossy()),
+        ];
+        if build_artifact == BuildArtifacts::CheckOnly {
+            util::invoke_cargo("check", &args, manifest_path.directory(), verbosity)?;
+        } else {
+            util::invoke_cargo("build", &args, manifest_path.directory(), verbosity)?;
+        }
+
         Ok(())
     };
 
@@ -345,7 +347,7 @@ pub(crate) fn execute_with_crate_metadata(
         format!("[1/{}]", build_artifact.steps()).bold(),
         "Building cargo project".bright_green().bold()
     );
-    build_cargo_project(&crate_metadata, verbosity, unstable_flags)?;
+    build_cargo_project(&crate_metadata, build_artifact, verbosity, unstable_flags)?;
     println!(
         " {} {}",
         format!("[2/{}]", build_artifact.steps()).bold(),

src/cmd/deploy.rs

@@ -29,7 +29,7 @@ fn load_contract_code(path: Option<&PathBuf>) -> Result<Vec<u8>> {
     let contract_wasm_path = match path {
         Some(path) => path.clone(),
         None => {
-            let metadata = crate_metadata::CrateMetadata::collect(&Default::default(), None)?;
+            let metadata = crate_metadata::CrateMetadata::collect(&Default::default())?;
             metadata.dest_wasm
         }
     };

src/cmd/metadata.rs

@@ -263,7 +263,7 @@ pub(crate) fn execute(
     build_artifact: BuildArtifacts,
     unstable_options: UnstableFlags,
 ) -> Result<BuildResult> {
-    let crate_metadata = CrateMetadata::collect(manifest_path, Some(build_artifact))?;
+    let crate_metadata = CrateMetadata::collect(manifest_path)?;
     let res = GenerateMetadataCommand {
         crate_metadata,
         verbosity,
@@ -374,8 +374,7 @@ mod tests {
             )?;
             test_manifest.write()?;
 
-            let crate_metadata =
-                CrateMetadata::collect(&test_manifest.manifest_path, Some(build_artifact))?;
+            let crate_metadata = CrateMetadata::collect(&test_manifest.manifest_path)?;
             let dest_bundle = cmd::metadata::execute(
                 &test_manifest.manifest_path,
                 None,

src/crate_metadata.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with cargo-contract.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{BuildArtifacts, ManifestPath};
+use crate::ManifestPath;
 use anyhow::{Context, Result};
 use cargo_metadata::{Metadata as CargoMetadata, MetadataCommand, Package};
 use semver::Version;
@@ -41,22 +41,9 @@ pub struct CrateMetadata {
 
 impl CrateMetadata {
     /// Parses the contract manifest and returns relevant metadata.
-    pub fn collect(
-        manifest_path: &ManifestPath,
-        build_artifact: Option<BuildArtifacts>,
-    ) -> Result<Self> {
+    pub fn collect(manifest_path: &ManifestPath) -> Result<Self> {
         let (metadata, root_package) = get_cargo_metadata(manifest_path)?;
-
-        let target_directory = if let Some(_ba @ BuildArtifacts::CheckOnly) = build_artifact {
-            let tmp_dir = tempfile::Builder::new()
-                .prefix("cargo-contract_")
-                .tempdir()?;
-            tmp_dir.into_path()
-        } else {
-            let mut target_directory = metadata.target_directory.clone();
-            target_directory.push("ink");
-            target_directory
-        };
+        let target_directory = metadata.target_directory.clone().as_path().join("ink");
 
         // Normalize the package name.
         let package_name = root_package.name.replace("-", "_");