Move wallet commands under a wallet subcommand

The PCZT commands are left at the top level, because only a couple of
them are connected to a wallet.

src/commands.rs

@@ -1,28 +1,46 @@
 use anyhow::anyhow;
+use clap::Args;
 use uuid::Uuid;
 use zcash_client_backend::data_api::WalletRead;
 use zcash_client_sqlite::AccountUuid;
 
-pub(crate) mod balance;
-pub(crate) mod enhance;
-pub(crate) mod import_ufvk;
-pub(crate) mod init;
-pub(crate) mod init_fvk;
-pub(crate) mod list_accounts;
-pub(crate) mod list_addresses;
-pub(crate) mod list_tx;
-pub(crate) mod list_unspent;
 pub(crate) mod pczt;
-pub(crate) mod propose;
-pub(crate) mod reset;
-pub(crate) mod send;
-pub(crate) mod shield;
-pub(crate) mod sync;
-pub(crate) mod upgrade;
+pub(crate) mod wallet;
 
 #[cfg(feature = "pczt-qr")]
 pub(crate) mod keystone;
 
+#[derive(Debug, Args)]
+pub(crate) struct Wallet {
+    /// Path to the wallet directory
+    #[arg(short, long)]
+    pub(crate) wallet_dir: Option<String>,
+
+    #[command(subcommand)]
+    pub(crate) command: wallet::Command,
+}
+
+#[derive(Debug, Args)]
+pub(crate) struct Pczt {
+    /// Path to a wallet directory
+    #[arg(short, long)]
+    pub(crate) wallet_dir: Option<String>,
+
+    #[command(subcommand)]
+    pub(crate) command: pczt::Command,
+}
+
+#[cfg(feature = "pczt-qr")]
+#[derive(Debug, Args)]
+pub(crate) struct Keystone {
+    /// Path to a wallet directory
+    #[arg(short, long)]
+    pub(crate) wallet_dir: Option<String>,
+
+    #[command(subcommand)]
+    pub(crate) command: keystone::Command,
+}
+
 pub(crate) fn select_account<DbT: WalletRead<AccountId = AccountUuid>>(
     db_data: &DbT,
     account_uuid: Option<Uuid>,

src/commands/wallet.rs

@@ -0,0 +1,65 @@
+use clap::Subcommand;
+
+pub(crate) mod balance;
+pub(crate) mod enhance;
+pub(crate) mod import_ufvk;
+pub(crate) mod init;
+pub(crate) mod init_fvk;
+pub(crate) mod list_accounts;
+pub(crate) mod list_addresses;
+pub(crate) mod list_tx;
+pub(crate) mod list_unspent;
+pub(crate) mod propose;
+pub(crate) mod reset;
+pub(crate) mod send;
+pub(crate) mod shield;
+pub(crate) mod sync;
+pub(crate) mod upgrade;
+
+#[derive(Debug, Subcommand)]
+pub(crate) enum Command {
+    /// Initialise a new light wallet
+    Init(init::Command),
+
+    /// Initialise a new view-only light wallet
+    InitFvk(init_fvk::Command),
+
+    /// Reset an existing light wallet (does not preserve imported UFVKs)
+    Reset(reset::Command),
+
+    /// Import a UFVK
+    ImportUfvk(import_ufvk::Command),
+
+    /// Upgrade an existing light wallet
+    Upgrade(upgrade::Command),
+
+    /// Scan the chain and sync the wallet
+    Sync(sync::Command),
+
+    /// Ensure all transactions have full data available
+    Enhance(enhance::Command),
+
+    /// Get the balance in the wallet
+    Balance(balance::Command),
+
+    /// List the accounts in the wallet
+    ListAccounts(list_accounts::Command),
+
+    /// List the addresses for an account in the wallet
+    ListAddresses(list_addresses::Command),
+
+    /// List the transactions in the wallet
+    ListTx(list_tx::Command),
+
+    /// List the unspent notes in the wallet
+    ListUnspent(list_unspent::Command),
+
+    /// Shield transparent funds received by the wallet
+    Shield(shield::Command),
+
+    /// Propose a transfer of funds to the given address and display the proposal
+    Propose(propose::Command),
+
+    /// Send funds to the given address
+    Send(send::Command),
+}

src/commands/balance.rs → src/commands/wallet/balance.rs

@@ -12,12 +12,10 @@ use zcash_client_sqlite::WalletDb;
 use zcash_protocol::value::{Zatoshis, COIN};
 
 use crate::{
-    config::get_wallet_network, data::get_db_paths, error, parse_currency, remote::tor_client,
-    ui::format_zec, MIN_CONFIRMATIONS,
+    commands::select_account, config::get_wallet_network, data::get_db_paths, error,
+    parse_currency, remote::tor_client, ui::format_zec, MIN_CONFIRMATIONS,
 };
 
-use super::select_account;
-
 // Options accepted for the `balance` command
 #[derive(Debug, Args)]
 pub(crate) struct Command {

src/commands/list_unspent.rs → src/commands/wallet/list_unspent.rs

@@ -8,9 +8,9 @@ use zcash_client_backend::{
 use zcash_client_sqlite::WalletDb;
 use zcash_protocol::value::{Zatoshis, MAX_MONEY};
 
-use crate::{config::get_wallet_network, data::get_db_paths, error, ui::format_zec};
-
-use super::select_account;
+use crate::{
+    commands::select_account, config::get_wallet_network, data::get_db_paths, error, ui::format_zec,
+};
 
 // Options accepted for the `list-unspent` command
 #[derive(Debug, Args)]

src/main.rs

@@ -34,69 +34,21 @@ fn parse_currency(data: &str) -> Result<Currency, String> {
 
 #[derive(Debug, Parser)]
 pub(crate) struct MyOptions {
-    /// Path to the wallet directory
-    #[arg(short, long)]
-    pub(crate) wallet_dir: Option<String>,
-
     #[command(subcommand)]
     pub(crate) command: Option<Command>,
 }
 
 #[derive(Debug, Subcommand)]
 pub(crate) enum Command {
-    /// Initialise a new light wallet
-    Init(commands::init::Command),
-
-    /// Initialise a new view-only light wallet
-    InitFvk(commands::init_fvk::Command),
-
-    /// Reset an existing light wallet (does not preserve imported UFVKs)
-    Reset(commands::reset::Command),
-
-    /// Import a UFVK
-    ImportUfvk(commands::import_ufvk::Command),
-
-    /// Upgrade an existing light wallet
-    Upgrade(commands::upgrade::Command),
-
-    /// Scan the chain and sync the wallet
-    Sync(commands::sync::Command),
-
-    /// Ensure all transactions have full data available
-    Enhance(commands::enhance::Command),
-
-    /// Get the balance in the wallet
-    Balance(commands::balance::Command),
-
-    /// List the accounts in the wallet
-    ListAccounts(commands::list_accounts::Command),
-
-    /// List the addresses for an account in the wallet
-    ListAddresses(commands::list_addresses::Command),
-
-    /// List the transactions in the wallet
-    ListTx(commands::list_tx::Command),
-
-    /// List the unspent notes in the wallet
-    ListUnspent(commands::list_unspent::Command),
-
-    /// Shield transparent funds received by the wallet
-    Shield(commands::shield::Command),
-
-    /// Propose a transfer of funds to the given address and display the proposal
-    Propose(commands::propose::Command),
-
-    /// Send funds to the given address
-    Send(commands::send::Command),
+    /// Manipulate a local wallet backed by `zcash_client_sqlite`
+    Wallet(commands::Wallet),
 
     /// Send funds using PCZTs
-    #[command(subcommand)]
-    Pczt(commands::pczt::Command),
+    Pczt(commands::Pczt),
 
     /// Emulate a Keystone device
     #[cfg(feature = "pczt-qr")]
-    #[command(subcommand)]
-    Keystone(commands::keystone::Command),
+    Keystone(commands::Keystone),
 }
 
 fn main() -> Result<(), anyhow::Error> {
@@ -108,15 +60,21 @@ fn main() -> Result<(), anyhow::Error> {
     let tui_logger: Option<()> = None;
     #[cfg(feature = "tui")]
     let tui_logger = match opts.command {
-        Some(Command::Sync(commands::sync::Command { defrag: true, .. })) => {
+        Some(Command::Wallet(commands::Wallet {
+            command:
+                commands::wallet::Command::Sync(commands::wallet::sync::Command {
+                    defrag: true, ..
+                }),
+            ..
+        })) => {
             tui_logger::init_logger(level_filter.parse().unwrap())?;
             Some(tui_logger::tracing_subscriber_layer())
         }
         #[cfg(feature = "pczt-qr")]
-        Some(Command::Pczt(commands::pczt::Command::ToQr(commands::pczt::qr::Send {
-            tui: true,
+        Some(Command::Pczt(commands::Pczt {
+            command: commands::pczt::Command::ToQr(commands::pczt::qr::Send { tui: true, .. }),
             ..
-        }))) => {
+        })) => {
             tui_logger::init_logger(level_filter.parse().unwrap())?;
             Some(tui_logger::tracing_subscriber_layer())
         }
@@ -156,39 +114,47 @@ fn main() -> Result<(), anyhow::Error> {
         let shutdown = ShutdownListener::new();
 
         match opts.command {
-            Some(Command::Init(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::InitFvk(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Reset(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::ImportUfvk(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Upgrade(command)) => command.run(opts.wallet_dir),
-            Some(Command::Sync(command)) => {
-                command
-                    .run(
-                        shutdown,
-                        opts.wallet_dir,
-                        #[cfg(feature = "tui")]
-                        tui,
-                    )
-                    .await
-            }
-            Some(Command::Enhance(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Balance(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::ListAccounts(command)) => command.run(opts.wallet_dir),
-            Some(Command::ListAddresses(command)) => command.run(opts.wallet_dir),
-            Some(Command::ListTx(command)) => command.run(opts.wallet_dir),
-            Some(Command::ListUnspent(command)) => command.run(opts.wallet_dir),
-            Some(Command::Shield(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Propose(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Send(command)) => command.run(opts.wallet_dir).await,
-            Some(Command::Pczt(command)) => match command {
-                commands::pczt::Command::Create(command) => command.run(opts.wallet_dir).await,
-                commands::pczt::Command::Shield(command) => command.run(opts.wallet_dir).await,
-                commands::pczt::Command::Inspect(command) => command.run(opts.wallet_dir).await,
+            Some(Command::Wallet(commands::Wallet {
+                wallet_dir,
+                command,
+            })) => match command {
+                commands::wallet::Command::Init(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::InitFvk(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::Reset(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::ImportUfvk(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::Upgrade(command) => command.run(wallet_dir),
+                commands::wallet::Command::Sync(command) => {
+                    command
+                        .run(
+                            shutdown,
+                            wallet_dir,
+                            #[cfg(feature = "tui")]
+                            tui,
+                        )
+                        .await
+                }
+                commands::wallet::Command::Enhance(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::Balance(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::ListAccounts(command) => command.run(wallet_dir),
+                commands::wallet::Command::ListAddresses(command) => command.run(wallet_dir),
+                commands::wallet::Command::ListTx(command) => command.run(wallet_dir),
+                commands::wallet::Command::ListUnspent(command) => command.run(wallet_dir),
+                commands::wallet::Command::Shield(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::Propose(command) => command.run(wallet_dir).await,
+                commands::wallet::Command::Send(command) => command.run(wallet_dir).await,
+            },
+            Some(Command::Pczt(commands::Pczt {
+                wallet_dir,
+                command,
+            })) => match command {
+                commands::pczt::Command::Create(command) => command.run(wallet_dir).await,
+                commands::pczt::Command::Shield(command) => command.run(wallet_dir).await,
+                commands::pczt::Command::Inspect(command) => command.run(wallet_dir).await,
                 commands::pczt::Command::Redact(command) => command.run().await,
-                commands::pczt::Command::Prove(command) => command.run(opts.wallet_dir).await,
-                commands::pczt::Command::Sign(command) => command.run(opts.wallet_dir).await,
+                commands::pczt::Command::Prove(command) => command.run(wallet_dir).await,
+                commands::pczt::Command::Sign(command) => command.run(wallet_dir).await,
                 commands::pczt::Command::Combine(command) => command.run().await,
-                commands::pczt::Command::Send(command) => command.run(opts.wallet_dir).await,
+                commands::pczt::Command::Send(command) => command.run(wallet_dir).await,
                 #[cfg(feature = "pczt-qr")]
                 commands::pczt::Command::ToQr(command) => {
                     command
@@ -203,9 +169,12 @@ fn main() -> Result<(), anyhow::Error> {
                 commands::pczt::Command::FromQr(command) => command.run(shutdown).await,
             },
             #[cfg(feature = "pczt-qr")]
-            Some(Command::Keystone(command)) => match command {
+            Some(Command::Keystone(commands::Keystone {
+                wallet_dir,
+                command,
+            })) => match command {
                 commands::keystone::Command::Enroll(command) => {
-                    command.run(shutdown, opts.wallet_dir).await
+                    command.run(shutdown, wallet_dir).await
                 }
             },
             None => Ok(()),