Merge branch 'master' into master

This commit is contained in:
Gary Yu
2019-04-25 14:45:43 +08:00
committed by GitHub
17 changed files with 772 additions and 26 deletions
+8
View File
@@ -624,6 +624,14 @@ pub fn wallet_command(
&global_wallet_args,
wallet_config.dark_background_color_scheme.unwrap_or(true),
),
("payments", Some(_)) => {
info!("payments command received");
command::payments(
inst_wallet(),
&global_wallet_args,
wallet_config.dark_background_color_scheme.unwrap_or(true),
)
}
("txs", Some(args)) => {
let a = arg_parse!(parse_txs_args(&args));
command::txs(
+4
View File
@@ -501,6 +501,10 @@ mod wallet_tests {
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "outputs"];
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
// payments
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "payments"];
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
// let logging finish
thread::sleep(Duration::from_millis(200));
Ok(())