From 78dc334afeec0748914254f106c576602835fcab Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 17 Nov 2020 16:45:45 -0800 Subject: [PATCH] Add real --version --- Cargo.lock | 1 + tokens/Cargo.toml | 1 + tokens/src/arg_parser.rs | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0683ccddd..4b411706a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4968,6 +4968,7 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-transaction-status", + "solana-version", "tempfile", "thiserror", ] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index ee1d861e80..fcc8f062fa 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -26,6 +26,7 @@ solana-runtime = { path = "../runtime", version = "1.5.0" } solana-sdk = { path = "../sdk", version = "1.5.0" } solana-stake-program = { path = "../programs/stake", version = "1.5.0" } solana-transaction-status = { path = "../transaction-status", version = "1.5.0" } +solana-version = { path = "../version", version = "1.5.0" } tempfile = "3.1.0" thiserror = "1.0" diff --git a/tokens/src/arg_parser.rs b/tokens/src/arg_parser.rs index d94ac2759c..35f6b54829 100644 --- a/tokens/src/arg_parser.rs +++ b/tokens/src/arg_parser.rs @@ -1,7 +1,9 @@ use crate::args::{ Args, BalancesArgs, Command, DistributeTokensArgs, StakeArgs, TransactionLogArgs, }; -use clap::{value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand}; +use clap::{ + crate_description, crate_name, value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand, +}; use solana_clap_utils::{ input_parsers::value_of, input_validators::{is_amount, is_valid_pubkey, is_valid_signer}, @@ -19,9 +21,9 @@ where T: Into + Clone, { let default_config_file = CONFIG_FILE.as_ref().unwrap(); - App::new("solana-tokens") - .about("about") - .version("version") + App::new(crate_name!()) + .about(crate_description!()) + .version(solana_version::version!()) .arg( Arg::with_name("config_file") .long("config")