From 7689044521a54afc6bfc61dbc4c660829b06ac82 Mon Sep 17 00:00:00 2001 From: Tyera Date: Thu, 5 Jan 2023 19:49:28 -0700 Subject: [PATCH] Fix solana-stake-accounts version (#29542) Fix clap inputs --- Cargo.lock | 1 + stake-accounts/Cargo.toml | 1 + stake-accounts/src/arg_parser.rs | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6f5bbb24..46b11a694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6524,6 +6524,7 @@ dependencies = [ "solana-runtime", "solana-sdk 1.15.0", "solana-stake-program", + "solana-version", ] [[package]] diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml index 4371840c6..b4a91ac1b 100644 --- a/stake-accounts/Cargo.toml +++ b/stake-accounts/Cargo.toml @@ -18,6 +18,7 @@ solana-rpc-client = { path = "../rpc-client", version = "=1.15.0" } solana-rpc-client-api = { path = "../rpc-client-api", version = "=1.15.0" } solana-sdk = { path = "../sdk", version = "=1.15.0" } solana-stake-program = { path = "../programs/stake", version = "=1.15.0" } +solana-version = { path = "../version", version = "=1.15.0" } [dev-dependencies] solana-runtime = { path = "../runtime", version = "=1.15.0" } diff --git a/stake-accounts/src/arg_parser.rs b/stake-accounts/src/arg_parser.rs index 4e9bf632a..b801973c5 100644 --- a/stake-accounts/src/arg_parser.rs +++ b/stake-accounts/src/arg_parser.rs @@ -3,7 +3,9 @@ use { Args, AuthorizeArgs, Command, CountArgs, MoveArgs, NewArgs, QueryArgs, RebaseArgs, SetLockupArgs, }, - clap::{value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand}, + clap::{ + crate_description, crate_name, value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand, + }, solana_clap_utils::{ input_parsers::unix_timestamp_from_rfc3339_datetime, input_validators::{is_amount, is_rfc3339_datetime, is_valid_pubkey, is_valid_signer}, @@ -133,9 +135,9 @@ where T: Into + Clone, { let default_config_file = CONFIG_FILE.as_ref().unwrap(); - App::new("solana-stake-accounts") - .about("about") - .version("version") + App::new(crate_name!()) + .about(crate_description!()) + .version(solana_version::version!()) .arg( Arg::with_name("config_file") .long("config")