refactor(gear-wasm-builder): put *.meta.txts along with other WASM…

… binaries

Co-authored-by: Shamil <[email protected]>

gcli/tests/cmd/program.rs

@@ -94,7 +94,7 @@ Metadata {
 
 #[test]
 fn test_command_program_metadata_works() -> Result<()> {
-    let meta = env::example_path("new-meta/demo_new_meta.meta.txt");
+    let meta = env::wasm_bin("demo_new_meta.meta.txt");
     let args = Args::new("program").action("meta").meta(meta);
     let result = common::gcli(Vec::<String>::from(args)).expect("run gcli failed");
 
@@ -109,7 +109,7 @@ fn test_command_program_metadata_works() -> Result<()> {
 
 #[test]
 fn test_command_program_metadata_derive_works() -> Result<()> {
-    let meta = env::example_path("new-meta/demo_new_meta.meta.txt");
+    let meta = env::wasm_bin("demo_new_meta.meta.txt");
     let args = Args::new("program")
         .action("meta")
         .meta(meta)

gcli/tests/common/env.rs

@@ -53,8 +53,3 @@ pub fn bin(name: &str) -> String {
 pub fn wasm_bin(name: &str) -> String {
     bin_path(name, true)
 }
-
-/// path of `example/binaries` folders
-pub fn example_path(name: &str) -> String {
-    ROOT.clone() + "/examples/" + name
-}

gcli/tests/gear.rs

@@ -37,7 +37,7 @@ fn paths() {
         env::bin("gear"),
         env::bin("gcli"),
         env::wasm_bin("demo_new_meta.opt.wasm"),
-        env::example_path("new-meta/demo_new_meta.meta.txt"),
+        env::wasm_bin("demo_new_meta.meta.txt"),
     ]
     .into_iter()
     .for_each(|path| {

utils/wasm-builder/src/wasm_project.rs

@@ -214,6 +214,8 @@ impl WasmProject {
 
         let mut source_code = "#![no_std] pub use orig_project::*;\n".to_owned();
 
+        fs::create_dir_all(&self.wasm_target_dir)?;
+
         // Write metadata
         if let Some(metadata) = &self.project_type.metadata() {
             let file_base_name = self
@@ -222,7 +224,7 @@ impl WasmProject {
                 .expect("Run `WasmProject::create_project()` first");
 
             let wasm_meta_path = self
-                .original_dir
+                .wasm_target_dir
                 .join([file_base_name, ".meta.txt"].concat());
 
             smart_fs::write_metadata(wasm_meta_path, metadata)
@@ -397,7 +399,6 @@ extern "C" fn metahash() {{
             .join(format!("{}.wasm", &file_base_name));
 
         fs::create_dir_all(&self.target_dir)?;
-        fs::create_dir_all(&self.wasm_target_dir)?;
 
         if self.project_type.is_metawasm() {
             self.postprocess_meta(&original_wasm_path, file_base_name)?;