Merge pull request #1276 from multiversx/template-cleanup-wasm

remove wasm renaming in template

contracts/examples/adder/mxsc-template.toml

@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "README.md",
     "multiversx.json",

contracts/examples/crypto-zombies/mxsc-template.toml

@@ -7,7 +7,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "multiversx.json",
 ]

contracts/examples/empty/mxsc-template.toml

@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "multiversx.json",
 ]

contracts/examples/ping-pong-egld/mxsc-template.toml

@@ -12,7 +12,6 @@ files_include = [
     "scenarios",
     "src",
     "tests",
-    "wasm/Cargo.toml",
     "Cargo.toml",
     "README.md",
     "multiversx.json",

framework/meta/src/cmd/standalone/template/contract_creator.rs

@@ -11,12 +11,13 @@ use super::{
 /// Creates a new contract on disk, from a template, given a name.
 pub fn create_contract(args: &TemplateArgs) {
     let version = get_repo_version(&args.tag);
+    let version_tag: String = version.get_tag();
     let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir());
     let target = target_from_args(args);
 
     let creator = ContractCreator::new(&repo_temp_download, args.template.clone(), target, false);
 
-    creator.create_contract();
+    creator.create_contract(version_tag);
 }
 
 fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget {
@@ -71,19 +72,19 @@ impl<'a> ContractCreator<'a> {
         }
     }
 
-    pub fn create_contract(&self) {
-        self.copy_template();
-        self.update_dependencies();
+    pub fn create_contract(&self, args_tag: String) {
+        self.copy_template(&args_tag);
+        self.update_dependencies(&args_tag);
         self.rename_template();
     }
 
-    pub fn copy_template(&self) {
+    pub fn copy_template(&self, args_tag: &str) {
         self.template_source
-            .copy_template(self.target.contract_dir());
+            .copy_template(self.target.contract_dir(), args_tag);
     }
 
-    pub fn update_dependencies(&self) {
-        self.adjuster.update_dependencies();
+    pub fn update_dependencies(&self, args_tag: &str) {
+        self.adjuster.update_dependencies(args_tag);
     }
 
     pub fn rename_template(&self) {

framework/meta/src/cmd/standalone/template/copy_util.rs

@@ -3,15 +3,28 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use crate::version_history::is_template_with_autogenerated_json;
+
 /// Will copy an entire folder according to a whitelist of allowed paths.
 ///
 /// The whitelist is expected to contain paths relative from the source path.
 ///
 /// If a folder is whitelisted, then everything in the folder is considered whitelisted too.
 ///
 /// The function creates all necessary folder structure in the target, no additional preparation required.
-pub fn whitelisted_deep_copy(source_root: &Path, target_root: &Path, whitelist: &[String]) {
-    perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
+pub fn whitelisted_deep_copy(
+    source_root: &Path,
+    target_root: &Path,
+    whitelist: &[String],
+    args_tag: &str,
+) {
+    if is_template_with_autogenerated_json(args_tag) {
+        perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist);
+    } else {
+        let mut tmp_whitelist = whitelist.to_vec();
+        tmp_whitelist.push("multiversx.json".into());
+        perform_file_copy(source_root, &PathBuf::new(), target_root, &tmp_whitelist);
+    }
 }
 
 fn is_whitelisted(path: &Path, whitelist: &[String]) -> bool {

framework/meta/src/cmd/standalone/template/repo_version.rs

@@ -1,3 +1,5 @@
+use crate::version_history::LAST_TEMPLATE_VERSION;
+
 pub enum RepoVersion {
     Master,
     Tag(String),
@@ -23,4 +25,11 @@ impl RepoVersion {
             },
         }
     }
+
+    pub fn get_tag(&self) -> String {
+        match self {
+            RepoVersion::Master => LAST_TEMPLATE_VERSION.to_string(),
+            RepoVersion::Tag(tag) => tag.to_string(),
+        }
+    }
 }

framework/meta/src/cmd/standalone/template/template_adjuster.rs

@@ -1,6 +1,7 @@
 use super::{template_metadata::TemplateMetadata, ContractCreatorTarget};
 use crate::{
     cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files},
+    version_history::is_template_with_autogenerated_wasm,
     CargoTomlContents,
 };
 use convert_case::{Case, Casing};
@@ -18,10 +19,10 @@ pub struct TemplateAdjuster {
     pub keep_paths: bool,
 }
 impl TemplateAdjuster {
-    pub fn update_dependencies(&self) {
+    pub fn update_dependencies(&self, args_tag: &str) {
         self.update_dependencies_root();
-        self.update_dependencies_wasm();
         self.update_dependencies_meta();
+        self.update_dependencies_wasm(args_tag);
     }
 
     fn update_dependencies_root(&self) {
@@ -48,7 +49,11 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_wasm(&self) {
+    fn update_dependencies_wasm(&self, args_tag: &str) {
+        if is_template_with_autogenerated_wasm(args_tag) {
+            return;
+        }
+
         let cargo_toml_path = self.target.contract_dir().join(WASM_CARGO_TOML);
         let mut toml = CargoTomlContents::load_from_file(&cargo_toml_path);
 

framework/meta/src/cmd/standalone/template/template_source.rs

@@ -17,11 +17,12 @@ pub struct TemplateSource<'a> {
 }
 
 impl<'a> TemplateSource<'a> {
-    pub fn copy_template(&self, target_path: impl AsRef<Path>) {
+    pub fn copy_template(&self, target_path: impl AsRef<Path>, args_tag: &str) {
         whitelisted_deep_copy(
             &self.source_path,
             target_path.as_ref(),
             &self.metadata.files_include,
+            args_tag,
         );
     }
 }

framework/meta/src/version_history.rs

@@ -61,8 +61,27 @@ pub fn template_versions() -> &'static [&'static str] {
 }
 
 pub fn validate_template_tag(tag: &str) -> bool {
-    let versions = template_versions();
-    versions.iter().any(|&tt| tt == tag)
+    template_versions().iter().any(|&tt| tt == tag)
+}
+
+pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] {
+    &VERSIONS[40..]
+}
+
+pub fn is_template_with_autogenerated_wasm(tag: &str) -> bool {
+    template_versions_with_autogenerated_wasm()
+        .iter()
+        .any(|&tt| tt == tag)
+}
+
+pub fn template_versions_with_autogenerated_json() -> &'static [&'static str] {
+    &VERSIONS[39..]
+}
+
+pub fn is_template_with_autogenerated_json(tag: &str) -> bool {
+    template_versions_with_autogenerated_json()
+        .iter()
+        .any(|&tt| tt == tag)
 }
 
 pub struct VersionIterator {
@@ -115,4 +134,20 @@ pub mod tests {
         assert!(validate_template_tag("0.43.0"));
         assert!(!validate_template_tag("0.42.0"));
     }
+
+    #[test]
+    fn template_versions_with_autogenerated_wasm_test() {
+        assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0");
+
+        assert!(is_template_with_autogenerated_wasm("0.45.0"));
+        assert!(!is_template_with_autogenerated_wasm("0.44.0"));
+    }
+
+    #[test]
+    fn template_versions_with_autogenerated_json_test() {
+        assert_eq!(template_versions_with_autogenerated_json()[0], "0.44.0");
+
+        assert!(is_template_with_autogenerated_json("0.44.0"));
+        assert!(!is_template_with_autogenerated_json("0.43.0"));
+    }
 }

framework/meta/tests/template_test.rs

@@ -5,7 +5,7 @@ use multiversx_sc_meta::{
         template_names_from_repo, ContractCreator, ContractCreatorTarget, RepoSource, RepoVersion,
     },
     find_workspace::find_current_workspace,
-    version_history,
+    version_history::{self, LAST_TEMPLATE_VERSION},
 };
 
 const TEMPLATE_TEMP_DIR_NAME: &str = "template-test";
@@ -72,7 +72,7 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
         target.clone(),
         true,
     )
-    .create_contract();
+    .create_contract(LAST_TEMPLATE_VERSION.to_string());
 
     if BUILD_CONTRACTS {
         build_contract(&target);
@@ -127,7 +127,7 @@ fn template_test_released(template_name: &str, new_name: &str) {
         target.clone(),
         false,
     )
-    .create_contract();
+    .create_contract(LAST_TEMPLATE_VERSION.to_string());
 
     if BUILD_CONTRACTS {
         build_contract(&target);