Revert "Merge branch 'master' into master"

This reverts commit a63f2c7cea, reversing
changes made to d774272fee.
This commit is contained in:
Gary Yu
2019-04-25 14:59:45 +08:00
parent a63f2c7cea
commit e509405b8a
17 changed files with 26 additions and 772 deletions
-8
View File
@@ -624,14 +624,6 @@ 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,10 +501,6 @@ 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(())
+1 -3
View File
@@ -163,9 +163,7 @@ subcommands:
short: f
long: fluff
- outputs:
about: Raw wallet self owned output info (list of outputs)
- payments:
about: Raw wallet payment output info (list of outputs)
about: Raw wallet output info (list of outputs)
- txs:
about: Display transaction information
args: