gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solana-tokens: Add real --version (bp #13659) (#13660)

Browse Source 
* Add real --version

(cherry picked from commit 78dc334afe)

# Conflicts:
#	Cargo.lock
#	tokens/Cargo.toml

* Update Cargo.toml

* Update Cargo.lock

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-11-18 03:25:05 +00:00
committed by GitHub
parent 855cf9a362
commit 81a26aa4fc
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -4956,6 +4956,7 @@ dependencies = [
"solana-runtime", "solana-runtime",
"solana-sdk", "solana-sdk",
"solana-stake-program", "solana-stake-program",
"solana-version",
"tempfile", "tempfile",
"thiserror", "thiserror",
"tokio 0.3.2", "tokio 0.3.2",

1
tokens/Cargo.toml
View File

@ -26,6 +26,7 @@ solana-remote-wallet = { path = "../remote-wallet", version = "1.4.10" }
solana-runtime = { path = "../runtime", version = "1.4.10" } solana-runtime = { path = "../runtime", version = "1.4.10" }
solana-sdk = { path = "../sdk", version = "1.4.10" } solana-sdk = { path = "../sdk", version = "1.4.10" }
solana-stake-program = { path = "../programs/stake", version = "1.4.10" } solana-stake-program = { path = "../programs/stake", version = "1.4.10" }
solana-version = { path = "../version", version = "1.4.10" }
tempfile = "3.1.0" tempfile = "3.1.0"
thiserror = "1.0" thiserror = "1.0"
tokio = { version = "0.3", features = ["full"] } tokio = { version = "0.3", features = ["full"] }

10
tokens/src/arg_parser.rs
View File

@ -1,7 +1,9 @@
use crate::args::{ use crate::args::{
Args, BalancesArgs, Command, DistributeTokensArgs, StakeArgs, TransactionLogArgs, 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::{ use solana_clap_utils::{
input_parsers::value_of, input_parsers::value_of,
input_validators::{is_amount, is_valid_pubkey, is_valid_signer}, input_validators::{is_amount, is_valid_pubkey, is_valid_signer},
@ -19,9 +21,9 @@ where
T: Into<OsString> + Clone, T: Into<OsString> + Clone,
{ {
let default_config_file = CONFIG_FILE.as_ref().unwrap(); let default_config_file = CONFIG_FILE.as_ref().unwrap();
App::new("solana-tokens") App::new(crate_name!())
.about("about") .about(crate_description!())
.version("version") .version(solana_version::version!())
.arg( .arg(
Arg::with_name("config_file") Arg::with_name("config_file")
.long("config") .long("config")