Shorten "validator-client" to "vc"

lighthouse/tests/validator_manager.rs

@@ -186,7 +186,7 @@ pub fn validator_create_disable_deposits() {
 pub fn validator_import_defaults() {
     CommandLineTest::validators_import()
         .flag("--validators-file", Some("./vals.json"))
-        .flag("--validator-client-token", Some("./token.json"))
+        .flag("--vc-token", Some("./token.json"))
         .assert_success(|config| {
             let expected = ImportConfig {
                 validators_file_path: PathBuf::from("./vals.json"),
@@ -202,7 +202,7 @@ pub fn validator_import_defaults() {
 pub fn validator_import_misc_flags() {
     CommandLineTest::validators_import()
         .flag("--validators-file", Some("./vals.json"))
-        .flag("--validator-client-token", Some("./token.json"))
+        .flag("--vc-token", Some("./token.json"))
         .flag("--ignore-duplicates", None)
         .assert_success(|config| {
             let expected = ImportConfig {
@@ -225,17 +225,17 @@ pub fn validator_import_missing_token() {
 #[test]
 pub fn validator_import_missing_validators_file() {
     CommandLineTest::validators_import()
-        .flag("--validator-client-token", Some("./token.json"))
+        .flag("--vc-token", Some("./token.json"))
         .assert_failed();
 }
 
 #[test]
 pub fn validator_move_defaults() {
     CommandLineTest::validators_move()
-        .flag("--src-validator-client-url", Some("http://localhost:1"))
-        .flag("--src-validator-client-token", Some("./1.json"))
-        .flag("--dest-validator-client-url", Some("http://localhost:2"))
-        .flag("--dest-validator-client-token", Some("./2.json"))
+        .flag("--src-vc-url", Some("http://localhost:1"))
+        .flag("--src-vc-token", Some("./1.json"))
+        .flag("--dest-vc-url", Some("http://localhost:2"))
+        .flag("--dest-vc-token", Some("./2.json"))
         .flag("--validators", Some("all"))
         .assert_success(|config| {
             let expected = MoveConfig {
@@ -255,10 +255,10 @@ pub fn validator_move_defaults() {
 #[test]
 pub fn validator_move_misc_flags_0() {
     CommandLineTest::validators_move()
-        .flag("--src-validator-client-url", Some("http://localhost:1"))
-        .flag("--src-validator-client-token", Some("./1.json"))
-        .flag("--dest-validator-client-url", Some("http://localhost:2"))
-        .flag("--dest-validator-client-token", Some("./2.json"))
+        .flag("--src-vc-url", Some("http://localhost:1"))
+        .flag("--src-vc-token", Some("./1.json"))
+        .flag("--dest-vc-url", Some("http://localhost:2"))
+        .flag("--dest-vc-token", Some("./2.json"))
         .flag(
             "--validators",
             Some(&format!("{},{}", EXAMPLE_PUBKEY_0, EXAMPLE_PUBKEY_1)),
@@ -287,10 +287,10 @@ pub fn validator_move_misc_flags_0() {
 #[test]
 pub fn validator_move_misc_flags_1() {
     CommandLineTest::validators_move()
-        .flag("--src-validator-client-url", Some("http://localhost:1"))
-        .flag("--src-validator-client-token", Some("./1.json"))
-        .flag("--dest-validator-client-url", Some("http://localhost:2"))
-        .flag("--dest-validator-client-token", Some("./2.json"))
+        .flag("--src-vc-url", Some("http://localhost:1"))
+        .flag("--src-vc-token", Some("./1.json"))
+        .flag("--dest-vc-url", Some("http://localhost:2"))
+        .flag("--dest-vc-token", Some("./2.json"))
         .flag("--validators", Some(&format!("{}", EXAMPLE_PUBKEY_0)))
         .flag("--builder-proposals", Some("false"))
         .assert_success(|config| {
@@ -313,10 +313,10 @@ pub fn validator_move_misc_flags_1() {
 #[test]
 pub fn validator_move_count() {
     CommandLineTest::validators_move()
-        .flag("--src-validator-client-url", Some("http://localhost:1"))
-        .flag("--src-validator-client-token", Some("./1.json"))
-        .flag("--dest-validator-client-url", Some("http://localhost:2"))
-        .flag("--dest-validator-client-token", Some("./2.json"))
+        .flag("--src-vc-url", Some("http://localhost:1"))
+        .flag("--src-vc-token", Some("./1.json"))
+        .flag("--dest-vc-url", Some("http://localhost:2"))
+        .flag("--dest-vc-token", Some("./2.json"))
         .flag("--validators", Some("42"))
         .assert_success(|config| {
             let expected = MoveConfig {

validator_manager/src/validators/import_validators.rs

@@ -8,8 +8,8 @@ use std::path::PathBuf;
 
 pub const CMD: &str = "import";
 pub const VALIDATORS_FILE_FLAG: &str = "validators-file";
-pub const VALIDATOR_CLIENT_URL_FLAG: &str = "validator-client-url";
-pub const VALIDATOR_CLIENT_TOKEN_FLAG: &str = "validator-client-token";
+pub const VC_URL_FLAG: &str = "vc-url";
+pub const VC_TOKEN_FLAG: &str = "vc-token";
 
 pub const DETECTED_DUPLICATE_MESSAGE: &str = "Duplicate validator detected!";
 
@@ -33,8 +33,8 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name(VALIDATOR_CLIENT_URL_FLAG)
-                .long(VALIDATOR_CLIENT_URL_FLAG)
+            Arg::with_name(VC_URL_FLAG)
+                .long(VC_URL_FLAG)
                 .value_name("HTTP_ADDRESS")
                 .help(
                     "A HTTP(S) address of a validator client using the keymanager-API. \
@@ -42,12 +42,12 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                     no changes are made to the validator client.",
                 )
                 .default_value("http://localhost:5062")
-                .requires(VALIDATOR_CLIENT_TOKEN_FLAG)
+                .requires(VC_TOKEN_FLAG)
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name(VALIDATOR_CLIENT_TOKEN_FLAG)
-                .long(VALIDATOR_CLIENT_TOKEN_FLAG)
+            Arg::with_name(VC_TOKEN_FLAG)
+                .long(VC_TOKEN_FLAG)
                 .value_name("PATH")
                 .help("The file containing a token required by the validator client.")
                 .takes_value(true),
@@ -79,8 +79,8 @@ impl ImportConfig {
     fn from_cli(matches: &ArgMatches) -> Result<Self, String> {
         Ok(Self {
             validators_file_path: clap_utils::parse_required(matches, VALIDATORS_FILE_FLAG)?,
-            vc_url: clap_utils::parse_required(matches, VALIDATOR_CLIENT_URL_FLAG)?,
-            vc_token_path: clap_utils::parse_required(matches, VALIDATOR_CLIENT_TOKEN_FLAG)?,
+            vc_url: clap_utils::parse_required(matches, VC_URL_FLAG)?,
+            vc_token_path: clap_utils::parse_required(matches, VC_TOKEN_FLAG)?,
             ignore_duplicates: matches.is_present(IGNORE_DUPLICATES_FLAG),
         })
     }

validator_manager/src/validators/move_validators.rs

@@ -23,10 +23,10 @@ pub const MOVE_DIR_NAME: &str = "lighthouse-validator-move";
 pub const VALIDATOR_SPECIFICATION_FILE: &str = "validator-specification.json";
 
 pub const CMD: &str = "move";
-pub const SRC_VALIDATOR_CLIENT_URL_FLAG: &str = "src-validator-client-url";
-pub const SRC_VALIDATOR_CLIENT_TOKEN_FLAG: &str = "src-validator-client-token";
-pub const DEST_VALIDATOR_CLIENT_URL_FLAG: &str = "dest-validator-client-url";
-pub const DEST_VALIDATOR_CLIENT_TOKEN_FLAG: &str = "dest-validator-client-token";
+pub const SRC_VC_URL_FLAG: &str = "src-vc-url";
+pub const SRC_VC_TOKEN_FLAG: &str = "src-vc-token";
+pub const DEST_VC_URL_FLAG: &str = "dest-vc-url";
+pub const DEST_VC_TOKEN_FLAG: &str = "dest-vc-token";
 pub const VALIDATORS_FLAG: &str = "validators";
 pub const GAS_LIMIT_FLAG: &str = "gas-limit";
 pub const FEE_RECIPIENT_FLAG: &str = "suggested-fee-recipient";
@@ -44,8 +44,8 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                 command.",
         )
         .arg(
-            Arg::with_name(SRC_VALIDATOR_CLIENT_URL_FLAG)
-                .long(SRC_VALIDATOR_CLIENT_URL_FLAG)
+            Arg::with_name(SRC_VC_URL_FLAG)
+                .long(SRC_VC_URL_FLAG)
                 .value_name("HTTP_ADDRESS")
                 .help(
                     "A HTTP(S) address of a validator client using the keymanager-API. \
@@ -53,19 +53,19 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                     that are to be moved.",
                 )
                 .required(true)
-                .requires(SRC_VALIDATOR_CLIENT_TOKEN_FLAG)
+                .requires(SRC_VC_TOKEN_FLAG)
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name(SRC_VALIDATOR_CLIENT_TOKEN_FLAG)
-                .long(SRC_VALIDATOR_CLIENT_TOKEN_FLAG)
+            Arg::with_name(SRC_VC_TOKEN_FLAG)
+                .long(SRC_VC_TOKEN_FLAG)
                 .value_name("PATH")
                 .help("The file containing a token required by the source validator client.")
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name(DEST_VALIDATOR_CLIENT_URL_FLAG)
-                .long(DEST_VALIDATOR_CLIENT_URL_FLAG)
+            Arg::with_name(DEST_VC_URL_FLAG)
+                .long(DEST_VC_URL_FLAG)
                 .value_name("HTTP_ADDRESS")
                 .help(
                     "A HTTP(S) address of a validator client using the keymanager-API. \
@@ -73,12 +73,12 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                     added as they are removed from the \"source\" validator client.",
                 )
                 .required(true)
-                .requires(DEST_VALIDATOR_CLIENT_TOKEN_FLAG)
+                .requires(DEST_VC_TOKEN_FLAG)
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name(DEST_VALIDATOR_CLIENT_TOKEN_FLAG)
-                .long(DEST_VALIDATOR_CLIENT_TOKEN_FLAG)
+            Arg::with_name(DEST_VC_TOKEN_FLAG)
+                .long(DEST_VC_TOKEN_FLAG)
                 .value_name("PATH")
                 .help("The file containing a token required by the destination validator client.")
                 .takes_value(true),
@@ -172,16 +172,10 @@ pub struct MoveConfig {
 impl MoveConfig {
     fn from_cli(matches: &ArgMatches) -> Result<Self, String> {
         Ok(Self {
-            src_vc_url: clap_utils::parse_required(matches, SRC_VALIDATOR_CLIENT_URL_FLAG)?,
-            src_vc_token_path: clap_utils::parse_required(
-                matches,
-                SRC_VALIDATOR_CLIENT_TOKEN_FLAG,
-            )?,
-            dest_vc_url: clap_utils::parse_required(matches, DEST_VALIDATOR_CLIENT_URL_FLAG)?,
-            dest_vc_token_path: clap_utils::parse_required(
-                matches,
-                DEST_VALIDATOR_CLIENT_TOKEN_FLAG,
-            )?,
+            src_vc_url: clap_utils::parse_required(matches, SRC_VC_URL_FLAG)?,
+            src_vc_token_path: clap_utils::parse_required(matches, SRC_VC_TOKEN_FLAG)?,
+            dest_vc_url: clap_utils::parse_required(matches, DEST_VC_URL_FLAG)?,
+            dest_vc_token_path: clap_utils::parse_required(matches, DEST_VC_TOKEN_FLAG)?,
             validators: clap_utils::parse_required(matches, VALIDATORS_FLAG)?,
             builder_proposals: clap_utils::parse_optional(matches, BUILDER_PROPOSALS_FLAG)?,
             fee_recipient: clap_utils::parse_optional(matches, FEE_RECIPIENT_FLAG)?,
@@ -219,7 +213,7 @@ async fn run<'a>(config: MoveConfig) -> Result<(), String> {
     if src_vc_url == dest_vc_url {
         return Err(format!(
             "--{} and --{} must be different",
-            SRC_VALIDATOR_CLIENT_URL_FLAG, DEST_VALIDATOR_CLIENT_URL_FLAG
+            SRC_VC_URL_FLAG, DEST_VC_URL_FLAG
         ));
     }