This commit is contained in:
Tyera Eulberg 2018-09-21 21:48:46 -06:00 committed by Grimes
parent 11ea9e7c4b
commit 7b7e8c0d3f
1 changed files with 6 additions and 6 deletions

View File

@ -143,7 +143,7 @@ pub fn parse_command(
}; };
let timestamp = if pay_matches.is_present("timestamp") { let timestamp = if pay_matches.is_present("timestamp") {
// Parse input for serde_json // Parse input for serde_json
let date_string = if !pay_matches.value_of("timestamp").unwrap().contains("Z") { let date_string = if !pay_matches.value_of("timestamp").unwrap().contains('Z') {
format!("\"{}Z\"", pay_matches.value_of("timestamp").unwrap()) format!("\"{}Z\"", pay_matches.value_of("timestamp").unwrap())
} else { } else {
format!("\"{}\"", pay_matches.value_of("timestamp").unwrap()) format!("\"{}\"", pay_matches.value_of("timestamp").unwrap())
@ -229,7 +229,7 @@ pub fn parse_command(
let date_string = if !timestamp_matches let date_string = if !timestamp_matches
.value_of("datetime") .value_of("datetime")
.unwrap() .unwrap()
.contains("Z") .contains('Z')
{ {
format!("\"{}Z\"", timestamp_matches.value_of("datetime").unwrap()) format!("\"{}Z\"", timestamp_matches.value_of("datetime").unwrap())
} else { } else {
@ -340,7 +340,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
let signature_str = signature.as_str().unwrap(); let signature_str = signature.as_str().unwrap();
Ok(format!("{}", signature_str)) Ok(signature_str.to_string())
} }
// Confirm the last client transaction by signature // Confirm the last client transaction by signature
WalletCommand::Confirm(signature) => { WalletCommand::Confirm(signature) => {
@ -392,7 +392,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
let signature_str = signature.as_str().unwrap(); let signature_str = signature.as_str().unwrap();
Ok(format!("{}", signature_str)) Ok(signature_str.to_string())
} else if *witnesses == None { } else if *witnesses == None {
let dt = timestamp.unwrap(); let dt = timestamp.unwrap();
let dt_pubkey = match timestamp_pubkey { let dt_pubkey = match timestamp_pubkey {
@ -430,7 +430,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} else if timestamp == None { } else if timestamp == None {
Ok("Witness Txs not yet handled".to_string()) Ok("Witness Txs not yet handled".to_string())
} else { } else {
Ok("Witness Txs not yet handled".to_string()) Ok("Combo Txs not yet handled".to_string())
} }
} }
// Apply time elapsed to contract // Apply time elapsed to contract
@ -500,7 +500,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
let signature_str = signature.as_str().unwrap(); let signature_str = signature.as_str().unwrap();
Ok(format!("{}", signature_str)) Ok(signature_str.to_string())
} }
} }
} }