simplify wasm file logic and improve error logging

near · Feb 21, 2022 · a4cbc39 · a4cbc39
1 parent ebf1a05
commit a4cbc39
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/workspaces/src/cargo/mod.rs b/workspaces/src/cargo/mod.rs
@@ -33,9 +33,14 @@ pub fn build_cargo_project<P: AsRef<Path> + Debug>(
             .collect())
     } else {
         Err(anyhow!(
-            "Failed to build project '{:?}': {}",
+            "Failed to build project '{:?}'.
+            Stderr:
+            {}
+            Stdout:
+            {}",
             project_path,
-            String::from_utf8(output.stderr)?
+            String::from_utf8(output.stderr)?,
+            String::from_utf8(output.stdout)?,
         ))
     }
 }
diff --git a/workspaces/src/network/mod.rs b/workspaces/src/network/mod.rs
@@ -123,20 +123,16 @@ where
             .iter()
             .filter(|f| f.as_str().ends_with(".wasm"))
             .collect::<Vec<_>>();
-        if wasm_files.is_empty() {
-            Err(anyhow!(
+        match wasm_files.as_slice() {
+            [] => Err(anyhow!(
                 "Compilation resulted in no '.wasm' target files. \
                  Please check that your project contains a NEAR smart contract."
-            ))
-        } else if wasm_files.len() > 1 {
-            Err(anyhow!(
+            )),
+            [file] => self.dev_deploy(&fs::read(file.canonicalize()?)?).await,
+            _ => Err(anyhow!(
                 "Compilation resulted in more than one '.wasm' target file: {:?}",
                 wasm_files
-            ))
-        } else {
-            let file = wasm_files.first().unwrap();
-            let wasm = fs::read(file.canonicalize()?)?;
-            self.dev_deploy(&wasm).await
+            )),
         }
     }
 }