Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-02-14 19:05:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix save command return value

Browse Source
This commit is contained in:
Aditya Kulkarni 2019-10-19 20:29:17 -07:00
parent c3af5a1ca2
commit e4f00a78d5
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/src/commands.rs
View File

@ -310,7 +310,19 @@ impl Command for SaveCommand {
} }
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String { fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_save() match lightclient.do_save() {
Ok(_) => {
let r = object!{ "result" => "success" };
r.pretty(2)
},
Err(e) => {
let r = object!{
"result" => "error",
"error" => e
};
r.pretty(2)
}
}
} }
} }
@ -490,7 +502,10 @@ impl Command for QuitCommand {
} }
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String { fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_save() match lightclient.do_save() {
Ok(_) => {"".to_string()},
Err(e) => e
}
} }
} }

12
lib/src/lightclient.rs
View File

@ -331,23 +331,17 @@ impl LightClient {
} }
} }
pub fn do_save(&self) -> String { pub fn do_save(&self) -> Result<(), String> {
let mut file_buffer = BufWriter::with_capacity( let mut file_buffer = BufWriter::with_capacity(
1_000_000, // 1 MB write buffer 1_000_000, // 1 MB write buffer
File::create(self.config.get_wallet_path()).unwrap()); File::create(self.config.get_wallet_path()).unwrap());
match self.wallet.write().unwrap().write(&mut file_buffer) { match self.wallet.write().unwrap().write(&mut file_buffer) {
Ok(_) => { Ok(_) => Ok(()),
info!("Saved wallet");
let response = object!{
"result" => "success"
};
response.pretty(2)
},
Err(e) => { Err(e) => {
let err = format!("ERR: {}", e); let err = format!("ERR: {}", e);
error!("{}", err); error!("{}", err);
err Err(e.to_string())
} }
} }
} }