refactor: specify default locations at core logic

Author: moliholy

crates/pop-chains/src/build/mod.rs

@@ -83,7 +83,7 @@ pub fn build_project(
 /// # Arguments
 /// * `path` - The optional path to the manifest, defaulting to the current directory if not
 ///   specified.
-pub fn is_supported(path: Option<&Path>) -> Result<bool, Error> {
+pub fn is_supported(path: &Path) -> Result<bool, Error> {
 	let manifest = from_path(path)?;
 	// Simply check for a chain dependency
 	const DEPENDENCIES: [&str; 4] =
@@ -118,7 +118,7 @@ fn build_binary_path<F>(project_path: &Path, path_builder: F) -> Result<PathBuf,
 where
 	F: Fn(&str) -> PathBuf,
 {
-	let manifest = from_path(Some(project_path))?;
+	let manifest = from_path(project_path)?;
 	let project_name = manifest.package().name();
 	let release = path_builder(project_name);
 	if !release.exists() {
@@ -1287,13 +1287,13 @@ mod tests {
 		assert!(!is_supported(Some(&path.join(name)))?);
 
 		// Chain
-		let mut manifest = from_path(Some(&path.join(name)))?;
+		let mut manifest = from_path(&path.join(name))?;
 		manifest
 			.dependencies
 			.insert("cumulus-client-collator".into(), Dependency::Simple("^0.14.0".into()));
 		let manifest = toml_edit::ser::to_string_pretty(&manifest)?;
 		write(path.join(name).join("Cargo.toml"), manifest)?;
-		assert!(is_supported(Some(&path.join(name)))?);
+		assert!(is_supported(&path.join(name))?);
 		Ok(())
 	}
 }

crates/pop-chains/src/build/runtime.rs

@@ -127,7 +127,7 @@ impl DeterministicBuilder {
 /// # Arguments
 /// * `path` - The optional path to the manifest, defaulting to the current directory if not
 ///   specified.
-pub fn is_supported(path: Option<&Path>) -> Result<bool, Error> {
+pub fn is_supported(path: &Path) -> Result<bool, Error> {
 	let manifest = from_path(path)?;
 	// Simply check for a parachain dependency
 	const DEPENDENCIES: [&str; 3] = ["frame-system", "frame-support", "substrate-wasm-builder"];

crates/pop-cli/src/commands/build/contract.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 /// Configuration for building a smart contract.
 pub struct BuildContract {
 	/// Path of the contract project.
-	pub(crate) path: Option<PathBuf>,
+	pub(crate) path: PathBuf,
 	/// Build profile: `true` for release mode, `false` for debug mode.
 	pub(crate) release: bool,
 }
@@ -25,8 +25,7 @@ impl BuildContract {
 	fn build(self, cli: &mut impl cli::traits::Cli) -> anyhow::Result<&'static str> {
 		cli.intro("Building your contract")?;
 		// Build contract.
-		let build_result =
-			build_smart_contract(self.path.as_deref(), self.release, Verbosity::Default)?;
+		let build_result = build_smart_contract(&self.path, self.release, Verbosity::Default)?;
 		cli.success(build_result.display())?;
 		cli.outro("Build completed successfully!")?;
 		Ok("contract")

crates/pop-cli/src/commands/build/mod.rs

@@ -107,10 +107,10 @@ impl Command {
 		#[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts", feature = "chain"))]
 		// If only contract feature enabled, build as contract
 		let project_path =
-			crate::common::builds::get_project_path(args.path.clone(), args.path_pos.clone());
+			crate::common::builds::ensure_project_path(args.path.clone(), args.path_pos.clone());
 
 		#[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts"))]
-		if pop_contracts::is_supported(project_path.as_deref())? {
+		if pop_contracts::is_supported(&project_path)? {
 			// All commands originating from root command are valid
 			let release = match args.profile {
 				Some(profile) => profile.into(),
@@ -122,17 +122,16 @@ impl Command {
 
 		// If project is a parachain runtime, build as parachain runtime
 		#[cfg(feature = "chain")]
-		if args.only_runtime || pop_chains::runtime::is_supported(project_path.as_deref())? {
+		if args.only_runtime || pop_chains::runtime::is_supported(&project_path)? {
 			let profile = match args.profile {
 				Some(profile) => profile,
 				None => args.release.into(),
 			};
-			let temp_path = PathBuf::from("./");
 			let features = args.features.unwrap_or_default();
 			let feature_list = collect_features(&features, args.benchmark, args.try_runtime);
 
 			BuildRuntime {
-				path: project_path.unwrap_or(temp_path).to_path_buf(),
+				path: project_path,
 				profile,
 				benchmark: feature_list.contains(&Benchmark.as_ref()),
 				try_runtime: feature_list.contains(&TryRuntime.as_ref()),
@@ -144,17 +143,16 @@ impl Command {
 
 		// If project is a parachain runtime, build as parachain runtime
 		#[cfg(feature = "chain")]
-		if pop_chains::is_supported(project_path.as_deref())? {
+		if pop_chains::is_supported(&project_path)? {
 			let profile = match args.profile {
 				Some(profile) => profile,
 				None => args.release.into(),
 			};
-			let temp_path = PathBuf::from("./");
 			let features = args.features.unwrap_or_default();
 			let feature_list = collect_features(&features, args.benchmark, args.try_runtime);
 
 			BuildChain {
-				path: project_path.unwrap_or(temp_path).to_path_buf(),
+				path: project_path,
 				package: args.package,
 				profile,
 				benchmark: feature_list.contains(&Benchmark.as_ref()),

crates/pop-cli/src/commands/build/runtime.rs

@@ -33,8 +33,8 @@ impl BuildRuntime {
 	pub(crate) fn execute(self) -> anyhow::Result<()> {
 		let cli = &mut cli::Cli;
 		let current_dir = current_dir().unwrap_or(PathBuf::from("./"));
-		let is_parachain = pop_chains::is_supported(Some(&current_dir))?;
-		let is_runtime = pop_chains::runtime::is_supported(Some(&current_dir))?;
+		let is_parachain = pop_chains::is_supported(&current_dir)?;
+		let is_runtime = pop_chains::runtime::is_supported(&current_dir)?;
 		// `pop build runtime` must be run inside a parachain project or a specific runtime folder.
 		if !is_parachain && !is_runtime {
 			return display_message(

crates/pop-cli/src/commands/build/spec.rs

@@ -141,8 +141,8 @@ pub(crate) enum RelayChain {
 #[derive(Args, Default)]
 pub struct BuildSpecCommand {
 	/// Directory path for your project [default: current directory]
-	#[arg(long)]
-	pub(crate) path: Option<PathBuf>,
+	#[arg(long, default_value = "./Cargo.toml")]
+	pub(crate) path: PathBuf,
 	/// File name for the resulting spec. If a path is given,
 	/// the necessary directories will be created
 	#[arg(short, long = "output")]
@@ -194,7 +194,7 @@ impl BuildSpecCommand {
 		let mut cli = Cli;
 		cli.intro("Generate your chain spec")?;
 		// Checks for appchain project.
-		if is_supported(self.path.as_deref())? {
+		if is_supported(self.path.as_path())? {
 			let build_spec = self.configure_build_spec(&mut cli).await?;
 			if let Err(e) = build_spec.build(&mut cli) {
 				cli.outro_cancel(e.to_string())?;
@@ -234,9 +234,6 @@ impl BuildSpecCommand {
 			..
 		} = self;
 
-		// Project path.
-		let path = path.unwrap_or(PathBuf::from("./"));
-
 		// Chain.
 		let chain = match chain {
 			Some(chain) => chain,
@@ -252,9 +249,7 @@ impl BuildSpecCommand {
 		// Output file.
 		let maybe_chain_spec_file = PathBuf::from(&chain);
 		// Check if the provided chain specification is a file.
-		let (output_file, prompt) = if maybe_chain_spec_file.exists() &&
-			maybe_chain_spec_file.is_file()
-		{
+		let (output_file, prompt) = if maybe_chain_spec_file.is_file() {
 			if output_file.is_some() {
 				cli.warning("NOTE: If an existing chain spec file is provided it will be used for the output path.")?;
 			}
@@ -450,7 +445,7 @@ impl BuildSpecCommand {
 		let package = if deterministic {
 			package
 				.or_else(|| {
-					from_path(Some(&runtime_dir))
+					from_path(&runtime_dir)
 						.ok()
 						.and_then(|manifest| manifest.package.map(|pkg| pkg.name))
 				})
@@ -745,13 +740,14 @@ mod tests {
 		let deterministic = true;
 		let package = "runtime-name";
 		let runtime_dir = PathBuf::from("./new-runtime-dir");
+		let path = PathBuf::from("./");
 
 		for build_spec_cmd in [
 			// No flags used.
 			BuildSpecCommand::default(),
 			// All flags used.
 			BuildSpecCommand {
-				path: None,
+				path,
 				output_file: Some(PathBuf::from(output_file)),
 				profile: Some(profile.clone()),
 				id: Some(para_id),
@@ -839,6 +835,7 @@ mod tests {
 		let deterministic = true;
 		let package = "runtime-name";
 		let runtime_dir = PathBuf::from("./new-runtime-dir");
+		let path = PathBuf::from("./");
 
 		// Create a temporary file to act as the existing chain spec file.
 		let temp_dir = tempdir()?;
@@ -855,7 +852,7 @@ mod tests {
 				},
 				// All flags used.
 				BuildSpecCommand {
-					path: None,
+					path: path.clone(),
 					output_file: Some(PathBuf::from(output_file)),
 					profile: Some(profile.clone()),
 					id: Some(para_id),

crates/pop-cli/src/commands/call/contract.rs

@@ -3,7 +3,7 @@
 use crate::{
 	cli::{self, traits::*},
 	common::{
-		builds::get_project_path,
+		builds::{ensure_project_path, get_project_path},
 		contracts::{has_contract_been_built, normalize_call_args, request_contract_function_args},
 		prompt::display_message,
 		urls,
@@ -186,12 +186,12 @@ impl CallContractCommand {
 
 	/// If the contract has not been built, build it in release mode.
 	async fn ensure_contract_built(&self, cli: &mut impl Cli) -> Result<()> {
-		let project_path = get_project_path(self.path.clone(), self.path_pos.clone());
+		let project_path = ensure_project_path(self.path.clone(), self.path_pos.clone());
 		// Build the contract in release mode
 		cli.warning("NOTE: contract has not yet been built.")?;
 		let spinner = spinner();
 		spinner.start("Building contract in RELEASE mode...");
-		let result = match build_smart_contract(project_path.as_deref(), true, Verbosity::Quiet) {
+		let result = match build_smart_contract(&project_path, true, Verbosity::Quiet) {
 			Ok(result) => result,
 			Err(e) => {
 				return Err(anyhow!(format!(
@@ -225,7 +225,7 @@ impl CallContractCommand {
 
 		project_path
 			.as_ref()
-			.map(|p| p.is_dir() && !has_contract_been_built(Some(p)))
+			.map(|p| p.is_dir() && !has_contract_been_built(p))
 			.unwrap_or_default()
 	}
 
@@ -401,7 +401,7 @@ impl CallContractCommand {
 		cli: &mut impl Cli,
 		prompt_to_repeat_call: bool,
 	) -> Result<()> {
-		let project_path = get_project_path(self.path.clone(), self.path_pos.clone());
+		let project_path = ensure_project_path(self.path.clone(), self.path_pos.clone());
 
 		let message = match &self.message {
 			Some(message) => message.to_string(),
@@ -410,9 +410,7 @@ impl CallContractCommand {
 			},
 		};
 		// Disable wallet signing and display warning if the call is read-only.
-		let path = PathBuf::from("./");
-		let message_metadata =
-			get_message(project_path.as_deref().unwrap_or_else(|| &path), &message)?;
+		let message_metadata = get_message(project_path.clone(), &message)?;
 		if !message_metadata.mutates && self.use_wallet {
 			cli.warning("NOTE: Signing is not required for this read-only call. The '--use-wallet' flag will be ignored.")?;
 			self.use_wallet = false;

crates/pop-cli/src/commands/call/mod.rs

@@ -39,14 +39,14 @@ impl CallArgs {
 		let current_dir = std::env::current_dir()?;
 
 		#[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts"))]
-		if pop_contracts::is_supported(Some(&current_dir))? {
+		if pop_contracts::is_supported(&current_dir)? {
 			let mut cmd = contract::CallContractCommand::default();
 			cmd.path_pos = Some(current_dir);
 			return Ok(Command::Contract(cmd));
 		}
 
 		#[cfg(feature = "chain")]
-		if pop_chains::is_supported(Some(&current_dir))? {
+		if pop_chains::is_supported(&current_dir)? {
 			return Ok(Command::Chain(Default::default()));
 		}
 

crates/pop-cli/src/commands/test/contract.rs

@@ -18,7 +18,7 @@ const HELP_HEADER: &str = "Smart contract testing options";
 #[clap(next_help_heading = HELP_HEADER)]
 pub(crate) struct TestContractCommand {
 	#[clap(skip)]
-	pub(crate) path: Option<PathBuf>,
+	pub(crate) path: PathBuf,
 	/// Run end-to-end tests
 	#[arg(short, long)]
 	e2e: bool,
@@ -52,12 +52,12 @@ impl TestContractCommand {
 				},
 			};
 
-			test_e2e_smart_contract(self.path.as_deref(), self.node.as_deref())?;
+			test_e2e_smart_contract(&self.path, self.node.as_deref())?;
 			cli.outro("End-to-end testing complete")?;
 			Ok(E2e)
 		} else {
 			cli.intro("Starting unit tests")?;
-			test_project(self.path.as_deref())?;
+			test_project(&self.path)?;
 			cli.outro("Unit testing complete")?;
 			Ok(Unit)
 		}

crates/pop-cli/src/commands/test/mod.rs

@@ -3,7 +3,7 @@
 #[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts"))]
 use crate::cli;
 use crate::common::{
-	builds::get_project_path,
+	builds::ensure_project_path,
 	Project::{self, *},
 	TestFeature::{self, Unit},
 };
@@ -75,20 +75,20 @@ impl Command {
 		#[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts"))]
 		cli: &mut impl cli::traits::Cli,
 	) -> anyhow::Result<(Project, TestFeature)> {
-		let project_path = get_project_path(args.path.clone(), args.path_pos.clone());
+		let project_path = ensure_project_path(args.path.clone(), args.path_pos.clone());
 
 		#[cfg(any(feature = "polkavm-contracts", feature = "wasm-contracts"))]
-		if pop_contracts::is_supported(project_path.as_deref())? {
+		if pop_contracts::is_supported(&project_path)? {
 			let mut cmd = args.contract;
-			cmd.path = project_path;
+			cmd.path = project_path.clone();
 			let feature = contract::TestContractCommand::execute(cmd, cli).await?;
 			return Ok((Contract, feature));
 		}
 
-		test_project(project_path.as_deref())?;
+		test_project(&project_path)?;
 
 		#[cfg(feature = "chain")]
-		if pop_chains::is_supported(project_path.as_deref())? {
+		if pop_chains::is_supported(&project_path)? {
 			return Ok((Chain, Unit));
 		}
 		Ok((Unknown, Unit))