fix: replace Vec<PackagePath> with Option<PackagePath>

Signed-off-by: Tomas Fabrizio Orsi <[email protected]>

Author: lima-limon-inc

bin/miden-cli/src/commands/new_account.rs

@@ -86,10 +86,6 @@ pub struct NewWalletCmd {
     /// Optional list of files specifying additional components to add to the account.
     #[arg(short, long)]
     pub extra_components: Vec<PathBuf>,
-    /// Optional list of files containing a Miden Package in `.masp` form from which a
-    /// component template can be extracted.
-    #[arg(short, long)]
-    pub packages: Vec<PathBuf>,
     /// Optional file path to a TOML file containing a list of key/values used for initializing
     /// storage. Each of these keys should map to the templated storage values within the passed
     /// list of component templates. The user will be prompted to provide values for any keys not
@@ -124,7 +120,7 @@ impl NewWalletCmd {
             account_type,
             self.storage_mode.into(),
             &component_template_paths,
-            &self.packages,
+            None,
             self.init_storage_data_path.clone(),
             self.deploy,
         )
@@ -165,10 +161,10 @@ pub struct NewAccountCmd {
     /// [[`NewAccountCmd::component_templates`]] or by [[`NewAccountCmd::packages`]].
     #[arg(short, long)]
     pub component_templates: Vec<PathBuf>,
-    /// List of files containing a Miden Package in `.masp` form from which a
-    /// component template is extracted.
+    /// File containing a Miden Package in `.masp` form which multiple component
+    /// templates can be extracted.
     #[arg(short, long)]
-    pub packages: Vec<PathBuf>,
+    pub package: PathBuf,
     /// Optional file path to a TOML file containing a list of key/values used for initializing
     /// storage. Each of these keys should map to the templated storage values within the passed
     /// list of component templates. The user will be prompted to provide values for any keys not
@@ -193,7 +189,7 @@ impl NewAccountCmd {
             self.account_type.into(),
             self.storage_mode.into(),
             &self.component_templates,
-            &self.packages,
+            Some(&self.package),
             self.init_storage_data_path.clone(),
             self.deploy,
         )
@@ -218,7 +214,7 @@ type PackagePath = PathBuf;
 /// Reads component templates and [[`miden_core::vm::Package`]]s from the given file paths.
 fn load_component_templates(
     component_paths: &[ComponentPath],
-    package_paths: &[PackagePath],
+    package_path: Option<&PackagePath>,
 ) -> Result<Vec<AccountComponentTemplate>, CliError> {
     let (cli_config, _) = load_config_file()?;
     let mut templates = Vec::new();
@@ -274,7 +270,7 @@ fn load_component_templates(
     }
 
     let packages_dir = &cli_config.package_directory;
-    for path in package_paths {
+    if let Some(path) = package_path {
         // If a user passes in a file with the `.masp` file extension, then we
         // leave the passed in path as is; since it probably is a full path.
         // This is the case with cargo-miden, which displays the full path to
@@ -358,19 +354,19 @@ async fn create_client_account<AUTH: TransactionAuthenticator + Sync + 'static>(
     account_type: AccountType,
     storage_mode: AccountStorageMode,
     component_template_paths: &[PathBuf],
-    package_paths: &[PathBuf],
+    package_path: Option<&PathBuf>,
     init_storage_data_path: Option<PathBuf>,
     deploy: bool,
 ) -> Result<Account, CliError> {
-    if component_template_paths.is_empty() && package_paths.is_empty() {
+    if component_template_paths.is_empty() && package_path.is_none() {
         return Err(CliError::InvalidArgument(
             "account must contain at least one component".into(),
         ));
     }
 
     // Load the component templates and initialization storage data.
     debug!("Loading component templates...");
-    let component_templates = load_component_templates(component_template_paths, package_paths)?;
+    let component_templates = load_component_templates(component_template_paths, package_path)?;
     debug!("Loaded {} component templates", component_templates.len());
     debug!("Loading initialization storage data...");
     let init_storage_data = load_init_storage_data(init_storage_data_path)?;