chore: update narwhal-node to use clap v3

armaniAllie93 · Aug 24, 2023 · 27b57a6 · 27b57a6
1 parent 5ddcd94
commit 27b57a6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -245,7 +245,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"] }
+clap = { version = "3.2.17", features = ["derive", "cargo"] }
 # clap = { version = "4.3.2", features = ["derive"] }
 collectable = "0.0.2"
 colored = "2.0.0"
@@ -410,7 +410,6 @@ slip10_ed25519 = "0.1.3"
 smallvec = "1.10.0"
 snap = "1.1.0"
 static_assertions = "1.1.0"
-structopt = "0.3.26"
 strum = { version = "0.24", features = ["derive"] }
 strum_macros = "0.24.3"
 syn = { version = "1.0.104", features = ["full", "derive", "extra-traits"] }

diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
@@ -154,8 +154,7 @@ ciborium-io = { version = "0.2", default-features = false, features = ["std"] }
 ciborium-ll = { version = "0.2", default-features = false }
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "std"] }
 clap-164d15cefe24d7eb = { package = "clap", version = "4", features = ["derive"] }
-clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["derive"] }
-clap-f595c2ba2a3f28df = { package = "clap", version = "2" }
+clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["cargo", "derive"] }
 clap_builder = { version = "4", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] }
 clap_lex-6f8ce4dd05d13bba = { package = "clap_lex", version = "0.2", default-features = false }
 clap_lex-d8f496e17d97b5cb = { package = "clap_lex", version = "0.5", default-features = false }
@@ -608,9 +607,7 @@ spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features =
 stable_deref_trait = { version = "1" }
 static_assertions = { version = "1", default-features = false }
 strip-ansi-escapes = { version = "0.1", default-features = false }
-strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false }
-strsim-c38e5c1d305a1b54 = { package = "strsim", version = "0.8", default-features = false }
-structopt = { version = "0.3" }
+strsim = { version = "0.10", default-features = false }
 strum = { version = "0.24", features = ["derive"] }
 subtle = { version = "2", default-features = false, features = ["i128", "std"] }
 subtle-ng = { version = "2", default-features = false, features = ["std"] }
@@ -630,8 +627,7 @@ termtree = { version = "0.4", default-features = false }
 test-fuzz = { version = "3", default-features = false }
 test-fuzz-internal = { version = "3", default-features = false }
 test-fuzz-runtime = { version = "3", default-features = false }
-textwrap-986da7b5efc2b80e = { package = "textwrap", version = "0.16", default-features = false }
-textwrap-a6292c17cd707f01 = { package = "textwrap", version = "0.11", default-features = false }
+textwrap = { version = "0.16", default-features = false }
 thiserror = { version = "1", default-features = false }
 thread_local = { version = "1", default-features = false }
 threadpool = { version = "1", default-features = false }
@@ -704,7 +700,6 @@ urlencoding = { version = "2", default-features = false }
 utf-8 = { version = "0.7", default-features = false }
 utf8parse = { version = "0.2" }
 uuid = { version = "1", features = ["fast-rng", "v4"] }
-vec_map = { version = "0.8", default-features = false }
 versions = { version = "4", default-features = false }
 vsimd = { version = "0.8", default-features = false, features = ["detect"] }
 vte = { version = "0.10" }
@@ -887,8 +882,7 @@ ciborium-ll = { version = "0.2", default-features = false }
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "std"] }
 clang-sys = { version = "1", default-features = false, features = ["clang_6_0", "runtime"] }
 clap-164d15cefe24d7eb = { package = "clap", version = "4", features = ["derive"] }
-clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["derive"] }
-clap-f595c2ba2a3f28df = { package = "clap", version = "2" }
+clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["cargo", "derive"] }
 clap_builder = { version = "4", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] }
 clap_derive-164d15cefe24d7eb = { package = "clap_derive", version = "4" }
 clap_derive-7b89eefb6aaa9bf3 = { package = "clap_derive", version = "3" }
@@ -1420,10 +1414,7 @@ spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features =
 stable_deref_trait = { version = "1" }
 static_assertions = { version = "1", default-features = false }
 strip-ansi-escapes = { version = "0.1", default-features = false }
-strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false }
-strsim-c38e5c1d305a1b54 = { package = "strsim", version = "0.8", default-features = false }
-structopt = { version = "0.3" }
-structopt-derive = { version = "0.4", default-features = false }
+strsim = { version = "0.10", default-features = false }
 strum = { version = "0.24", features = ["derive"] }
 strum_macros = { version = "0.24", default-features = false }
 subprocess = { version = "0.2", default-features = false }
@@ -1450,8 +1441,7 @@ test-fuzz = { version = "3", default-features = false }
 test-fuzz-internal = { version = "3", default-features = false }
 test-fuzz-macro = { version = "3", default-features = false }
 test-fuzz-runtime = { version = "3", default-features = false }
-textwrap-986da7b5efc2b80e = { package = "textwrap", version = "0.16", default-features = false }
-textwrap-a6292c17cd707f01 = { package = "textwrap", version = "0.11", default-features = false }
+textwrap = { version = "0.16", default-features = false }
 thiserror = { version = "1", default-features = false }
 thiserror-impl = { version = "1", default-features = false }
 thread_local = { version = "1", default-features = false }
@@ -1534,7 +1524,6 @@ utf-8 = { version = "0.7", default-features = false }
 utf8parse = { version = "0.2" }
 uuid = { version = "1", features = ["fast-rng", "v4"] }
 variant_count = { version = "1", default-features = false }
-vec_map = { version = "0.8", default-features = false }
 version_check = { version = "0.9", default-features = false }
 versions = { version = "4", default-features = false }
 vsimd = { version = "0.8", default-features = false, features = ["detect"] }

diff --git a/narwhal/node/Cargo.toml b/narwhal/node/Cargo.toml
@@ -11,7 +11,7 @@ arc-swap.workspace = true
 async-trait.workspace = true
 bytes.workspace = true
 cfg-if.workspace = true
-clap = "2.34"
+clap.workspace = true
 futures.workspace = true
 rand.workspace = true
 thiserror.workspace = true
@@ -50,7 +50,6 @@ reqwest.workspace = true
 pretty_assertions.workspace = true
 serde-reflection.workspace = true
 serde_yaml.workspace = true
-structopt.workspace = true
 test-utils = { path = "../test-utils", package = "narwhal-test-utils" }
 
 [features]

diff --git a/narwhal/node/src/generate_format.rs b/narwhal/node/src/generate_format.rs
@@ -1,5 +1,6 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
+use clap::Parser;
 use config::{CommitteeBuilder, Epoch, WorkerIndex, WorkerInfo};
 use crypto::{KeyPair, NetworkKeyPair};
 use fastcrypto::{
@@ -10,7 +11,6 @@ use mysten_network::Multiaddr;
 use rand::{prelude::StdRng, SeedableRng};
 use serde_reflection::{Registry, Result, Samples, Tracer, TracerConfig};
 use std::{fs::File, io::Write};
-use structopt::{clap::arg_enum, StructOpt};
 use types::{
     Batch, BatchDigest, Certificate, CertificateDigest, Header, HeaderDigest, HeaderV1Builder,
     MetadataV1, VersionedMetadata, WorkerOthersBatchMessage, WorkerOwnBatchMessage,
@@ -143,22 +143,20 @@ fn get_registry() -> Result<Registry> {
     tracer.registry()
 }
 
-arg_enum! {
-#[derive(Debug, StructOpt, Clone, Copy)]
+#[derive(Debug, clap::ValueEnum, Clone, Copy)]
 enum Action {
     Print,
     Test,
     Record,
 }
-}
 
-#[derive(Debug, StructOpt)]
-#[structopt(
+#[derive(Debug, Parser)]
+#[clap(
     name = "Narwhal format generator",
     about = "Trace serde (de)serialization to generate format descriptions for Narwhal types"
 )]
 struct Options {
-    #[structopt(possible_values = &Action::variants(), default_value = "Print", case_insensitive = true)]
+    #[clap(value_enum, default_value = "Print", case_insensitive = true)]
     action: Action,
 }