fix missing result of get_from

This commit is contained in:
Alexey Proshutinskiy 2021-07-01 22:33:39 +03:00
parent 25c08ac829
commit 9cdcfb840f

View File

@ -32,7 +32,7 @@ module_manifest!();
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
pub struct Config { pub struct Config {
pub timeout: u64, pub timeout: u64,
pub multiaddr: Option<String> pub multiaddr: Option<String>,
} }
fn save_multiaddr(multiaddr: String) { fn save_multiaddr(multiaddr: String) {
@ -59,10 +59,11 @@ pub(crate) fn create_config() {
if fs::metadata(CONFIG_FILE_PATH).is_err() { if fs::metadata(CONFIG_FILE_PATH).is_err() {
write_config(Config { write_config(Config {
timeout: DEFAULT_TIMEOUT_SEC, timeout: DEFAULT_TIMEOUT_SEC,
multiaddr: None multiaddr: None,
}); });
} }
} }
pub fn main() { pub fn main() {
WasmLoggerBuilder::new() WasmLoggerBuilder::new()
.with_log_level(log::LevelFilter::Info) .with_log_level(log::LevelFilter::Info)
@ -97,7 +98,13 @@ pub fn get_from(hash: String, multiaddr: String) -> IpfsResult {
let particle_vault_path = format!("/tmp/vault/{}", particle_id); let particle_vault_path = format!("/tmp/vault/{}", particle_id);
let file_path = format!("{}/{}", particle_vault_path, hash); let file_path = format!("{}/{}", particle_vault_path, hash);
ipfs_get(hash, file_path, timeout) let get_result = ipfs_get(hash, file_path.clone(), timeout);
return if get_result.success {
IpfsResult { success: true, result: file_path }
} else {
get_result
}
} }
#[marine] #[marine]