Update to clap v4 (#470)

Cargo.toml

@@ -27,6 +27,7 @@ ic-transport-types = { path = "ic-transport-types", version = "0.27.0" }
 
 ic-certification = "0.27.0"
 candid = "0.9.5"
+clap = "4.4.3"
 hex = "0.4.3"
 leb128 = "0.2.5"
 ring = "0.16.20"

icx-cert/Cargo.toml

@@ -19,7 +19,7 @@ include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
 [dependencies]
 anyhow = "1.0"
 base64 = "0.13"
-clap = { version = "3.1.8", features = ["derive", "cargo"] }
+clap = { workspace = true, features = ["derive", "cargo", "color"] }
 hex = { workspace = true }
 ic-certification = { workspace = true }
 leb128 = "0.2.4"

icx-cert/src/main.rs

@@ -4,7 +4,7 @@ use clap::{crate_authors, crate_version, Parser};
 mod pprint;
 
 #[derive(Parser)]
-#[clap(
+#[command(
     version = crate_version!(),
     author = crate_authors!(),
 )]
@@ -15,12 +15,7 @@ enum Command {
         url: String,
 
         /// Specifies one or more encodings to accept.
-        #[clap(
-            long,
-            multiple_occurrences(true),
-            multiple_values(true),
-            number_of_values(1)
-        )]
+        #[arg(long)]
         accept_encoding: Option<Vec<String>>,
     },
 }
@@ -33,3 +28,14 @@ fn main() -> Result<()> {
         } => pprint::pprint(url, accept_encoding),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Command;
+    use clap::CommandFactory;
+
+    #[test]
+    fn valid_command() {
+        Command::command().debug_assert();
+    }
+}

icx/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { version = "1.0", features = ["backtrace"] }
 candid = { workspace = true, features = ["parser"] }
-clap = { version = "3.0.14", features = ["derive", "cargo"] }
+clap = { workspace = true, features = ["derive", "cargo", "color"] }
 hex = { workspace = true }
 humantime = "2.0.1"
 ic-agent = { workspace = true, default-features = true }

icx/src/main.rs

@@ -5,7 +5,7 @@ use candid::{
     types::{Function, Type, TypeInner},
     CandidType, Decode, Deserialize, IDLArgs, IDLProg, TypeEnv,
 };
-use clap::{crate_authors, crate_version, Parser};
+use clap::{crate_authors, crate_version, Parser, ValueEnum};
 use ic_agent::{
     agent::{self, signed::SignedUpdate},
     agent::{
@@ -75,35 +75,32 @@ enum SubCommand {
 #[derive(Parser)]
 struct CallOpts {
     /// The Canister ID to call.
-    #[clap(parse(try_from_str), required = true)]
     canister_id: Principal,
 
     /// Output the serialization of a message to STDOUT.
-    #[clap(long)]
+    #[arg(long)]
     serialize: bool,
 
     /// Path to a candid file to analyze the argument. Otherwise candid will parse the
     /// argument without type hint.
-    #[clap(long)]
+    #[arg(long)]
     candid: Option<PathBuf>,
 
-    #[clap(required = true)]
     method_name: String,
 
     /// The type of output (hex or IDL).
-    #[clap(long, default_value = "idl")]
+    #[arg(long, value_enum, default_value_t = ArgType::Idl)]
     arg: ArgType,
 
     /// The type of output (hex or IDL).
-    #[clap(long, default_value = "idl")]
+    #[arg(long, value_enum, default_value_t = ArgType::Idl)]
     output: ArgType,
 
     /// Argument to send, in Candid textual format.
-    #[clap()]
     arg_value: Option<String>,
 }
 
-#[derive(Parser)]
+#[derive(ValueEnum, Clone)]
 enum ArgType {
     Idl,
     Raw,
@@ -583,3 +580,14 @@ async fn main() -> Result<()> {
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::Opts;
+    use clap::CommandFactory;
+
+    #[test]
+    fn valid_command() {
+        Opts::command().debug_assert();
+    }
+}