Merge updates manually

2019-10-22 23:47:29 +02:00
parent 1b4bfae1f6 30f6927350
commit 3fb483aa08
12 changed files with 120 additions and 34 deletions
--- a/lib/src/commands.rs
+++ b/lib/src/commands.rs
@@ -356,7 +356,11 @@ impl Command for LockCommand {

    fn exec(&self, args: &[&str], lightclient: &LightClient) -> String {
        if args.len() != 0 {
-            return self.help();
+            let mut h = vec![];
+            h.push("Extra arguments to lock. Did you mean 'encrypt'?");
+            h.push("");
+            
+            return format!("{}\n{}", h.join("\n"), self.help());
        }

        match lightclient.wallet.write().unwrap().lock() {