chore: update direct usage of clap to v4

Cargo.toml

@@ -251,8 +251,7 @@ cached = "0.43.0"
 camino = "1.1.1"
 cfg-if = "1.0.0"
 chrono = { version = "0.4.26", features = ["clock", "serde"] }
-clap = { version = "3.2.17", features = ["derive", "cargo"] }
-# clap = { version = "4.3.2", features = ["derive"] }
+clap = { version = "4.3.2", features = ["derive", "wrap_help"] }
 collectable = "0.0.2"
 colored = "2.0.0"
 comfy-table = "6.1.3"

crates/sui-benchmark/src/options.rs

@@ -49,7 +49,7 @@ pub struct Opts {
     pub local: bool,
     /// Required in remote benchmark, namely when local = false
     /// Multiple fullnodes can be specified.
-    #[clap(long, multiple_values = true, value_delimiter = ',', global = true)]
+    #[clap(long, num_args(1..), value_delimiter = ',', global = true)]
     pub fullnode_rpc_addresses: Vec<String>,
     /// Whether to submit transactions to a fullnode.
     /// If true, use FullNodeProxy.

crates/sui-cluster-test/src/cluster.rs

@@ -3,7 +3,6 @@
 
 use super::config::{ClusterTestOpt, Env};
 use async_trait::async_trait;
-use clap::*;
 use std::net::SocketAddr;
 use std::path::Path;
 use sui_config::Config;

crates/sui-cluster-test/src/config.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 // SPDX-License-Identifier: Apache-2.0
 use clap::*;
 
-#[derive(Parser, Clone, ArgEnum)]
+#[derive(Parser, Clone, ValueEnum)]
 pub enum Env {
     Devnet,
     Staging,
@@ -18,7 +18,7 @@ pub enum Env {
 #[derive(Parser)]
 #[clap(name = "", rename_all = "kebab-case")]
 pub struct ClusterTestOpt {
-    #[clap(arg_enum)]
+    #[clap(value_enum)]
     pub env: Env,
     #[clap(long)]
     pub faucet_address: Option<String>,

crates/sui-cluster-test/src/lib.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 use crate::faucet::{FaucetClient, FaucetClientFactory};
 use async_trait::async_trait;
-use clap::*;
 use cluster::{Cluster, ClusterFactory};
 use config::ClusterTestOpt;
 use futures::{stream::FuturesUnordered, StreamExt};

crates/sui-core/src/generate_format.rs

@@ -164,7 +164,7 @@ fn get_registry() -> Result<Registry> {
     tracer.registry()
 }
 
-#[derive(Debug, Parser, Clone, Copy, ArgEnum)]
+#[derive(Debug, Parser, Clone, Copy, ValueEnum)]
 enum Action {
     Print,
     Test,
@@ -177,7 +177,7 @@ enum Action {
     about = "Trace serde (de)serialization to generate format descriptions for Sui types"
 )]
 struct Options {
-    #[clap(arg_enum, default_value = "Print", ignore_case = true)]
+    #[clap(value_enum, default_value = "Print", ignore_case = true)]
     action: Action,
 }