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

Make solana ping take optional lamports argument (#7029)

Browse Source 
* Make solana ping take optional lamports argument

* Use clap's default_value
This commit is contained in:
Ryo Onodera
2019-11-19 14:50:09 +09:00
committed by GitHub
parent 0eb78e461d
commit 7ccc029f77
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/cli.rs
View File

@ -79,6 +79,7 @@ pub enum CliCommand {
GetSlot, GetSlot,
GetTransactionCount, GetTransactionCount,
Ping { Ping {
lamports: u64,
interval: Duration, interval: Duration,
count: Option<u64>, count: Option<u64>,
timeout: Duration, timeout: Duration,
@ -864,6 +865,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
CliCommand::GetEpochInfo => process_get_epoch_info(&rpc_client), CliCommand::GetEpochInfo => process_get_epoch_info(&rpc_client),
CliCommand::GetTransactionCount => process_get_transaction_count(&rpc_client), CliCommand::GetTransactionCount => process_get_transaction_count(&rpc_client),
CliCommand::Ping { CliCommand::Ping {
lamports,
interval, interval,
count, count,
timeout, timeout,
@ -871,6 +873,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
} => process_ping( } => process_ping(
&rpc_client, &rpc_client,
config, config,
*lamports,
interval, interval,
count, count,
timeout, timeout,

19
cli/src/cluster_query.rs
View File

@ -84,6 +84,14 @@ impl ClusterQuerySubCommands for App<'_, '_> {
.takes_value(true) .takes_value(true)
.help("Stop after submitting count transactions"), .help("Stop after submitting count transactions"),
) )
.arg(
Arg::with_name("lamports")
.long("lamports")
.value_name("NUMBER")
.takes_value(true)
.default_value("1")
.help("Number of lamports to transfer for each transaction"),
)
.arg( .arg(
Arg::with_name("timeout") Arg::with_name("timeout")
.short("t") .short("t")
@ -128,6 +136,7 @@ pub fn parse_catchup(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliErro
} }
pub fn parse_cluster_ping(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> { pub fn parse_cluster_ping(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
let lamports = value_t_or_exit!(matches, "lamports", u64);
let interval = Duration::from_secs(value_t_or_exit!(matches, "interval", u64)); let interval = Duration::from_secs(value_t_or_exit!(matches, "interval", u64));
let count = if matches.is_present("count") { let count = if matches.is_present("count") {
Some(value_t_or_exit!(matches, "count", u64)) Some(value_t_or_exit!(matches, "count", u64))
@ -142,6 +151,7 @@ pub fn parse_cluster_ping(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, Cl
}; };
Ok(CliCommandInfo { Ok(CliCommandInfo {
command: CliCommand::Ping { command: CliCommand::Ping {
lamports,
interval, interval,
count, count,
timeout, timeout,
@ -288,6 +298,7 @@ pub fn process_get_transaction_count(rpc_client: &RpcClient) -> ProcessResult {
pub fn process_ping( pub fn process_ping(
rpc_client: &RpcClient, rpc_client: &RpcClient,
config: &CliConfig, config: &CliConfig,
lamports: u64,
interval: &Duration, interval: &Duration,
count: &Option<u64>, count: &Option<u64>,
timeout: &Duration, timeout: &Duration,
@ -314,7 +325,8 @@ pub fn process_ping(
let (recent_blockhash, fee_calculator) = rpc_client.get_new_blockhash(&last_blockhash)?; let (recent_blockhash, fee_calculator) = rpc_client.get_new_blockhash(&last_blockhash)?;
last_blockhash = recent_blockhash; last_blockhash = recent_blockhash;
let transaction = system_transaction::transfer(&config.keypair, &to, 1, recent_blockhash); let transaction =
system_transaction::transfer(&config.keypair, &to, lamports, recent_blockhash);
check_account_for_fee(rpc_client, config, &fee_calculator, &transaction.message)?; check_account_for_fee(rpc_client, config, &fee_calculator, &transaction.message)?;
match rpc_client.send_transaction(&transaction) { match rpc_client.send_transaction(&transaction) {
@ -332,8 +344,8 @@ pub fn process_ping(
let elapsed_time_millis = elapsed_time.as_millis() as u64; let elapsed_time_millis = elapsed_time.as_millis() as u64;
confirmation_time.push_back(elapsed_time_millis); confirmation_time.push_back(elapsed_time_millis);
println!( println!(
"{}1 lamport transferred: seq={:<3} time={:>4}ms signature={}", "{}{} lamport(s) transferred: seq={:<3} time={:>4}ms signature={}",
CHECK_MARK, seq, elapsed_time_millis, signature CHECK_MARK, lamports, seq, elapsed_time_millis, signature
); );
confirmed_count += 1; confirmed_count += 1;
} }
@ -631,6 +643,7 @@ mod tests {
parse_command(&test_ping).unwrap(), parse_command(&test_ping).unwrap(),
CliCommandInfo { CliCommandInfo {
command: CliCommand::Ping { command: CliCommand::Ping {
lamports: 1,
interval: Duration::from_secs(1), interval: Duration::from_secs(1),
count: Some(2), count: Some(2),
timeout: Duration::from_secs(3), timeout: Duration::from_secs(3),