refactor: various improvements

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

@@ -16,25 +16,25 @@ const DEFAULT_URI: &str = "//Alice";
 #[derive(Args, Clone)]
 pub struct CallParachainCommand {
 	/// The pallet containing the extrinsic to execute.
-	#[arg(long)]
+	#[arg(short, long)]
 	pallet: Option<String>,
 	/// The extrinsic to execute within the chosen pallet.
-	#[arg(long)]
+	#[arg(short, long)]
 	extrinsic: Option<String>,
 	/// The extrinsic arguments, encoded as strings.
-	#[arg(long, num_args = 0..,)]
+	#[arg(short, long, num_args = 0..,)]
 	args: Vec<String>,
 	/// Websocket endpoint of a node.
-	#[arg(short = 'u', long, value_parser)]
+	#[arg(short, long, value_parser)]
 	url: Option<Url>,
 	/// Secret key URI for the account signing the extrinsic.
 	///
 	/// e.g.
 	/// - for a dev account "//Alice"
 	/// - with a password "//Alice///SECRET_PASSWORD"
-	#[arg(long)]
+	#[arg(short, long)]
 	suri: Option<String>,
-	/// Automatically signs and submits the extrinsic without asking for confirmation.
+	/// Automatically signs and submits the extrinsic without prompting for confirmation.
 	#[arg(short('y'), long)]
 	skip_confirm: bool,
 }
@@ -73,9 +73,8 @@ impl CallParachainCommand {
 				break;
 			}
 
-			if !prompt_to_repeat_call
-				|| !cli
-					.confirm("Do you want to perform another call?")
+			if !prompt_to_repeat_call ||
+				!cli.confirm("Do you want to perform another call?")
 					.initial_value(false)
 					.interact()?
 			{
@@ -137,9 +136,8 @@ impl CallParachainCommand {
 
 			// Resolve extrinsic.
 			let extrinsic = match self.extrinsic {
-				Some(ref extrinsic_name) => {
-					find_extrinsic_by_name(&chain.pallets, &pallet.name, extrinsic_name).await?
-				},
+				Some(ref extrinsic_name) =>
+					find_extrinsic_by_name(&chain.pallets, &pallet.name, extrinsic_name).await?,
 				None => {
 					let mut prompt_extrinsic = cli.select("Select the extrinsic to call:");
 					for extrinsic in &pallet.extrinsics {
@@ -175,9 +173,8 @@ impl CallParachainCommand {
 			// Resolve who is signing the extrinsic.
 			let suri = match self.clone().suri {
 				Some(suri) => suri,
-				None => {
-					cli.input("Signer of the extrinsic:").default_input(DEFAULT_URI).interact()?
-				},
+				None =>
+					cli.input("Signer of the extrinsic:").default_input(DEFAULT_URI).interact()?,
 			};
 
 			return Ok(CallParachain {
@@ -199,11 +196,11 @@ impl CallParachainCommand {
 
 	// Function to check if all required fields are specified
 	fn requires_user_input(&self) -> bool {
-		self.pallet.is_none()
-			|| self.extrinsic.is_none()
-			|| self.args.is_empty()
-			|| self.url.is_none()
-			|| self.suri.is_none()
+		self.pallet.is_none() ||
+			self.extrinsic.is_none() ||
+			self.args.is_empty() ||
+			self.url.is_none() ||
+			self.suri.is_none()
 	}
 }
 
@@ -227,7 +224,7 @@ struct CallParachain {
 	/// - for a dev account "//Alice"
 	/// - with a password "//Alice///SECRET_PASSWORD"
 	suri: String,
-	/// Whether to automatically sign and submit the extrinsic without asking for confirmation.
+	/// Whether to automatically sign and submit the extrinsic without prompting for confirmation.
 	skip_confirm: bool,
 }
 
@@ -261,9 +258,8 @@ impl CallParachain {
 		tx: DynamicPayload,
 		cli: &mut impl Cli,
 	) -> Result<()> {
-		if !self.skip_confirm
-			&& !cli
-				.confirm("Do you want to submit the extrinsic?")
+		if !self.skip_confirm &&
+			!cli.confirm("Do you want to submit the extrinsic?")
 				.initial_value(true)
 				.interact()?
 		{

crates/pop-common/src/errors.rs

@@ -17,10 +17,10 @@ pub enum Error {
 	IO(#[from] std::io::Error),
 	#[error("Failed to create keypair from URI: {0}")]
 	KeyPairCreation(String),
-	#[error("Failed to get manifest path: {0}")]
-	ManifestPath(String),
 	#[error("Manifest error: {0}")]
 	ManifestError(#[from] cargo_toml::Error),
+	#[error("Failed to get manifest path: {0}")]
+	ManifestPath(String),
 	#[error("ParseError error: {0}")]
 	ParseError(#[from] url::ParseError),
 	#[error("Failed to parse secret URI: {0}")]

crates/pop-parachains/src/call/mod.rs

@@ -49,9 +49,11 @@ pub async fn sign_and_submit_extrinsic(
 	let result = api
 		.tx()
 		.sign_and_submit_then_watch_default(&tx, &signer)
-		.await?
+		.await
+		.map_err(|e| Error::ExtrinsicSubmissionError(format!("{:?}", e)))?
 		.wait_for_finalized_success()
-		.await?;
+		.await
+		.map_err(|e| Error::ExtrinsicSubmissionError(format!("{:?}", e)))?;
 	Ok(format!("{:?}", result.extrinsic_hash()))
 }
 

crates/pop-parachains/src/errors.rs

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
 
-use subxt::ext::scale_decode;
 use thiserror::Error;
 use zombienet_sdk::OrchestratorError;
 
@@ -20,14 +19,12 @@ pub enum Error {
 	EndowmentError,
 	#[error("The extrinsic is not supported")]
 	ExtrinsicNotSupported,
-	#[error("Failed decode a value")]
-	FromHexError(#[from] hex::FromHexError),
+	#[error("Extrinsic submission error: {0}")]
+	ExtrinsicSubmissionError(String),
 	#[error("IO error: {0}")]
 	IO(#[from] std::io::Error),
 	#[error("JSON error: {0}")]
 	JsonError(#[from] serde_json::Error),
-	#[error("Metadata error: {0}")]
-	MetadataError(#[from] subxt::error::MetadataError),
 	#[error("Error parsing metadata for parameter {0} conversion")]
 	MetadataParsingError(String),
 	#[error("Missing binary: {0}")]
@@ -40,14 +37,10 @@ pub enum Error {
 	OrchestratorError(#[from] OrchestratorError),
 	#[error("Failed to create pallet directory")]
 	PalletDirCreation,
-	#[error("The `Pallet` property is missing from the call variant")]
-	PalletMissing,
 	#[error("Failed to find the pallet {0}")]
 	PalletNotFound(String),
 	#[error("Failed to process the arguments provided by the user.")]
 	ParamProcessingError,
-	#[error("Failed to parse the response")]
-	ParsingResponseError(#[from] scale_decode::Error),
 	#[error("Invalid path")]
 	PathError,
 	#[error("Failed to execute rustfmt")]

crates/pop-parachains/src/lib.rs

@@ -30,7 +30,7 @@ pub use indexmap::IndexSet;
 pub use new_pallet::{create_pallet_template, new_pallet_options::*, TemplatePalletConfig};
 pub use new_parachain::instantiate_template_dir;
 // External export from subxt.
-pub use subxt::{dynamic::Value, tx::DynamicPayload, OnlineClient, SubstrateConfig};
+pub use subxt::{tx::DynamicPayload, OnlineClient, SubstrateConfig};
 pub use templates::{Config, Parachain, Provider};
 pub use up::Zombienet;
 pub use utils::helpers::is_initial_endowment_valid;