Depend on clap 3.2.22 for 1.63.0 msrv

payjoin · Nov 29, 2023 · 1e5acb5 · 1e5acb5
1 parent 93f61d3
commit 1e5acb5
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 82 deletions.
diff --git a/payjoin-cli/Cargo.lock b/payjoin-cli/Cargo.lock
diff --git a/payjoin-cli/Cargo.toml b/payjoin-cli/Cargo.toml
@@ -20,7 +20,7 @@ local-https = ["rcgen", "rustls", "hyper-rustls"]
 anyhow = "1.0.70"
 bip21 = "0.3.1"
 bitcoincore-rpc = "0.17.0"
-clap = "4.1.4"
+clap = { version = "3.2.22", features = ["derive"] }
 config = "0.13.3"
 env_logger = "0.9.0"
 hyper = { version = "0.14", features = ["full"] }

diff --git a/payjoin-cli/src/main.rs b/payjoin-cli/src/main.rs
@@ -36,16 +36,20 @@ fn cli() -> ArgMatches {
         .arg(Arg::new("rpchost")
             .long("rpchost")
             .short('r')
+            .takes_value(true)
             .help("The port of the bitcoin node"))
         .arg(Arg::new("cookie_file")
             .long("cookie-file")
             .short('c')
+            .takes_value(true)
             .help("Path to the cookie file of the bitcoin node"))
         .arg(Arg::new("rpcuser")
             .long("rpcuser")
+            .takes_value(true)
             .help("The username for the bitcoin node"))
         .arg(Arg::new("rpcpass")
             .long("rpcpass")
+            .takes_value(true)
             .help("The password for the bitcoin node"))
         .subcommand_required(true)
         .subcommand(
@@ -73,10 +77,12 @@ fn cli() -> ArgMatches {
                 .arg(Arg::new("port")
                     .long("host-port")
                     .short('p')
+                    .takes_value(true)
                     .help("The local port to listen on"))
                 .arg(Arg::new("endpoint")
                     .long("endpoint")
                     .short('e')
+                    .takes_value(true)
                     .help("The `pj=` endpoint to receive the payjoin request"))
                 .arg(Arg::new("sub_only")
                     .long("sub-only")