Merge #224: fix(pretty-format): use --pretty in any position

c475363 chore(clippy): clippy fixes (Vadim Anufriev)
daebe53 test(pretty): add tests for pretty option (Vadim Anufriev)
17a4dca fix(pretty): use pretty option in any position (Vadim Anufriev)

Pull request description:

  <!-- You can erase any parts of this template not applicable to your Pull Request. -->

  ### Description

  Fix `--pretty` flag to work in any position by marking it as a global argument.

  Previously the flag only worked before subcommands (`bdk-cli --pretty key generate`) but failed after
    (`bdk-cli key generate --pretty`).

  ### Notes to the reviewers
  **Before the fix:**
  Works:
  ```bash
  -> % cargo run -- --pretty key generate
  +-------------+-----------------------------------------------------------------------------------------------------------------+
  | Fingerprint | 3e68be40                                                                                                        |
  +-------------+-----------------------------------------------------------------------------------------------------------------+
  | Mnemonic    | wheat equip exhaust funny panic lend message champion slim derive alcohol differ                                |
  +-------------+-----------------------------------------------------------------------------------------------------------------+
  | Xprv        | tprv8ZgxMBicQKsPdmyStjLXkChBJnUa5DBVJY5J46C3qbe98623M9uqD9wrDtcSZe4hLCodZdKacuY8YPzrNWFUEUwSrpa12KiEBikwLTjiYWP |
  +-------------+-----------------------------------------------------------------------------------------------------------------+
  ```

  Doesn't work:
  ```bash
  -> % cargo run -- key generate --pretty
  error: unexpected argument '--pretty' found

  Usage: bdk-cli key generate [OPTIONS]

  For more information, try '--help'.
  ```

  <!-- In this section you can include notes directed to the reviewers, like explaining why some parts
  of the PR were done in a specific way -->

  ## Changelog notice

  <!-- Notice the release manager should include in the release tag message changelog -->
  <!-- See https://keepachangelog.com/en/1.0.0/ for examples -->

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

  #### Bugfixes:

  * [ ] This pull request breaks the existing API
  * [x] I've added tests to reproduce the issue which are now passing
  * [ ] I'm linking the issue being fixed by this PR

ACKs for top commit:
  notmandatory:
    ACK c475363
  tvpeter:
    tACK c475363

Tree-SHA512: 748860bf542b0da80407b0b15b068b6bb4a519913eec85251439a32e9d40ccec0af13edfd21ef4ab42f43d26e79e1996c958c9569955bb90f8d9033717aae792

Author: tvpeter

src/commands.rs

@@ -52,7 +52,7 @@ pub struct CliOpts {
     #[arg(env = "DATADIR", short = 'd', long = "datadir")]
     pub datadir: Option<std::path::PathBuf>,
     /// Output results in pretty format (instead of JSON).
-    #[arg(long = "pretty")]
+    #[arg(long = "pretty", global = true)]
     pub pretty: bool,
     /// Top level cli sub-commands.
     #[command(subcommand)]

src/handlers.rs

@@ -1093,9 +1093,8 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
                     }
                 };
 
-                let mut wallet = new_persisted_wallet(network, &mut persister, &wallet_opts)?;
-                let blockchain_client =
-                    new_blockchain_client(&wallet_opts, &wallet, database_path)?;
+                let mut wallet = new_persisted_wallet(network, &mut persister, wallet_opts)?;
+                let blockchain_client = new_blockchain_client(wallet_opts, &wallet, database_path)?;
 
                 let result = handle_online_wallet_subcommand(
                     &mut wallet,
@@ -1108,10 +1107,10 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
             };
             #[cfg(not(any(feature = "sqlite", feature = "redb")))]
             let result = {
-                let wallet = new_wallet(network, &wallet_opts)?;
+                let wallet = new_wallet(network, wallet_opts)?;
                 let blockchain_client =
-                    crate::utils::new_blockchain_client(&wallet_opts, &wallet, database_path)?;
-                let mut wallet = new_wallet(network, &wallet_opts)?;
+                    crate::utils::new_blockchain_client(wallet_opts, &wallet, database_path)?;
+                let mut wallet = new_wallet(network, wallet_opts)?;
                 handle_online_wallet_subcommand(&mut wallet, blockchain_client, online_subcommand)
                     .await?
             };
@@ -1162,10 +1161,10 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
             };
             #[cfg(not(any(feature = "sqlite", feature = "redb")))]
             let result = {
-                let mut wallet = new_wallet(network, &wallet_opts)?;
+                let mut wallet = new_wallet(network, wallet_opts)?;
                 handle_offline_wallet_subcommand(
                     &mut wallet,
-                    &wallet_opts,
+                    wallet_opts,
                     &cli_opts,
                     offline_subcommand.clone(),
                 )?

tests/cli_flags.rs

@@ -0,0 +1,46 @@
+// Copyright (c) 2020-2025 Bitcoin Dev Kit Developers
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+//! CLI Flags Tests
+//!
+//! Tests for global CLI flags and their behavior
+
+use std::process::Command;
+
+#[test]
+fn test_without_pretty_flag() {
+    let output = Command::new("cargo")
+        .args("run -- key generate".split_whitespace())
+        .output()
+        .unwrap();
+
+    assert!(output.status.success());
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    assert!(serde_json::from_str::<serde_json::Value>(&stdout).is_ok());
+}
+
+#[test]
+fn test_pretty_flag_before_subcommand() {
+    let output = Command::new("cargo")
+        .args("run -- --pretty key generate".split_whitespace())
+        .output()
+        .unwrap();
+
+    assert!(output.status.success());
+}
+
+#[test]
+fn test_pretty_flag_after_subcommand() {
+    let output = Command::new("cargo")
+        .args("run -- key generate --pretty".split_whitespace())
+        .output()
+        .unwrap();
+
+    assert!(output.status.success());
+}