From 8f58b7301a1c1bcc23f700ee4b5b405a80ba41c7 Mon Sep 17 00:00:00 2001
From: AlexD10S <alexfraga10@gmail.com>
Date: Mon, 10 Jun 2024 09:13:19 +0200
Subject: [PATCH] fix: placeholder for contract and enum_variants error

---
 crates/pop-cli/src/commands/new/contract.rs  | 21 +++-----------------
 crates/pop-cli/src/commands/new/mod.rs       | 15 ++++++++++++++
 crates/pop-cli/src/commands/new/parachain.rs | 15 --------------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/crates/pop-cli/src/commands/new/contract.rs b/crates/pop-cli/src/commands/new/contract.rs
index afcbfe8b..d057e4df 100644
--- a/crates/pop-cli/src/commands/new/contract.rs
+++ b/crates/pop-cli/src/commands/new/contract.rs
@@ -28,21 +28,6 @@ pub struct NewContractCommand {
 	pub(crate) template: Option<Template>,
 }
 
-#[macro_export]
-macro_rules! enum_variants {
-	($e: ty) => {{
-		PossibleValuesParser::new(
-			<$e>::VARIANTS
-				.iter()
-				.map(|p| PossibleValue::new(p.as_ref()))
-				.collect::<Vec<_>>(),
-		)
-		.try_map(|s| {
-			<$e>::from_str(&s).map_err(|e| format!("could not convert from {s} to provider"))
-		})
-	}};
-}
-
 impl NewContractCommand {
 	pub(crate) async fn execute(&self) -> Result<()> {
 		clear_screen()?;
@@ -79,8 +64,8 @@ async fn guide_user_to_generate_contract() -> Result<NewContractCommand> {
 		.interact()?;
 
 	let path: String = input("Where should your project be created?")
-		.placeholder("../")
-		.default_input("../")
+		.placeholder("./")
+		.default_input("./")
 		.interact()?;
 
 	let mut prompt = cliclack::select("Select a template provider: ".to_string());
@@ -113,8 +98,8 @@ fn generate_contract_from_template(
 		template.name(),
 	))?;
 	let contract_path = check_destination_path(path, name)?;
-
 	fs::create_dir_all(contract_path.as_path())?;
+
 	let spinner = cliclack::spinner();
 	spinner.start("Generating contract...");
 
diff --git a/crates/pop-cli/src/commands/new/mod.rs b/crates/pop-cli/src/commands/new/mod.rs
index 35d9b306..73196aab 100644
--- a/crates/pop-cli/src/commands/new/mod.rs
+++ b/crates/pop-cli/src/commands/new/mod.rs
@@ -9,6 +9,21 @@ pub mod pallet;
 #[cfg(feature = "parachain")]
 pub mod parachain;
 
+#[macro_export]
+macro_rules! enum_variants {
+	($e: ty) => {{
+		PossibleValuesParser::new(
+			<$e>::VARIANTS
+				.iter()
+				.map(|p| PossibleValue::new(p.as_ref()))
+				.collect::<Vec<_>>(),
+		)
+		.try_map(|s| {
+			<$e>::from_str(&s).map_err(|e| format!("could not convert from {s} to provider"))
+		})
+	}};
+}
+
 #[derive(Args)]
 #[command(args_conflicts_with_subcommands = true)]
 pub struct NewArgs {
diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs
index df710a1d..b04f3d89 100644
--- a/crates/pop-cli/src/commands/new/parachain.rs
+++ b/crates/pop-cli/src/commands/new/parachain.rs
@@ -56,21 +56,6 @@ pub struct NewParachainCommand {
 	pub(crate) initial_endowment: Option<String>,
 }
 
-#[macro_export]
-macro_rules! enum_variants {
-	($e: ty) => {{
-		PossibleValuesParser::new(
-			<$e>::VARIANTS
-				.iter()
-				.map(|p| PossibleValue::new(p.as_ref()))
-				.collect::<Vec<_>>(),
-		)
-		.try_map(|s| {
-			<$e>::from_str(&s).map_err(|e| format!("could not convert from {s} to provider"))
-		})
-	}};
-}
-
 impl NewParachainCommand {
 	pub(crate) async fn execute(&self) -> Result<Template> {
 		clear_screen()?;