Make unoptimized wasm not show up in target folder

src/cmd/build.rs

@@ -242,11 +242,8 @@ pub(crate) fn execute(
     verbosity: Option<Verbosity>,
     unstable_options: UnstableFlags,
     optimize_contract: bool,
-) -> Result<PathBuf> {
-    let mut crate_metadata = CrateMetadata::collect(manifest_path)?;
-    if !optimize_contract {
-        crate_metadata.dest_wasm.set_extension("wasm.unoptimized");
-    }
+) -> Result<Option<PathBuf>> {
+    let crate_metadata = CrateMetadata::collect(manifest_path)?;
     execute_with_metadata(
         &crate_metadata,
         verbosity,
@@ -267,7 +264,7 @@ pub(crate) fn execute_with_metadata(
     verbosity: Option<Verbosity>,
     unstable_options: UnstableFlags,
     optimize_contract: bool,
-) -> Result<PathBuf> {
+) -> Result<Option<PathBuf>> {
     println!(
         " {} {}",
         "[1/3]".bold(),
@@ -280,15 +277,16 @@ pub(crate) fn execute_with_metadata(
         "Post processing wasm file".bright_green().bold()
     );
     post_process_wasm(&crate_metadata)?;
-    if optimize_contract {
-        println!(
-            " {} {}",
-            "[3/3]".bold(),
-            "Optimizing wasm file".bright_green().bold()
-        );
-        optimize_wasm(&crate_metadata)?;
+    if !optimize_contract {
+        return Ok(None);
     }
-    Ok(crate_metadata.dest_wasm.clone())
+    println!(
+        " {} {}",
+        "[3/3]".bold(),
+        "Optimizing wasm file".bright_green().bold()
+    );
+    optimize_wasm(&crate_metadata)?;
+    Ok(Some(crate_metadata.dest_wasm.clone()))
 }
 
 #[cfg(feature = "test-ci-only")]

src/cmd/metadata.rs

@@ -186,7 +186,8 @@ impl GenerateMetadataCommand {
             self.verbosity,
             self.unstable_options.clone(),
             true,
-        )?;
+        )?
+        .expect("dest_wasm must exist");
 
         let wasm = fs::read(&self.crate_metadata.dest_wasm)?;
         Ok((dest_wasm, blake2_hash(wasm.as_slice())))

src/main.rs

@@ -277,7 +277,8 @@ fn exec(cmd: Command) -> Result<String> {
                     verbosity.try_into()?,
                     unstable_options.try_into()?,
                     true,
-                )?;
+                )?
+                .expect("dest_wasm must exist");
                 return Ok(format!(
                     "\nYour contract's code is ready. You can find it here:\n{}",
                     dest_wasm.display().to_string().bold()
@@ -319,12 +320,13 @@ fn exec(cmd: Command) -> Result<String> {
             unstable_options,
         } => {
             let manifest_path = ManifestPath::try_from(manifest_path.as_ref())?;
-            let _dest_unoptimized_wasm = cmd::build::execute(
+            let maybe_dest_wasm = cmd::build::execute(
                 &manifest_path,
                 verbosity.try_into()?,
                 unstable_options.try_into()?,
                 false,
             )?;
+            assert!(maybe_dest_wasm.is_none(), "no dest_wasm should exist");
             Ok(format!("\nYour contract's code was built successfully."))
         }
         Command::GenerateMetadata {