Skip to content

Commit

Permalink
Merge branch 'main' into refactor/discovery-tasks-r0
Browse files Browse the repository at this point in the history
  • Loading branch information
dariusc93 authored Nov 30, 2024
2 parents 4537144 + ae3158c commit e5a4ae4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion extensions/warp-ipfs/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl Default for RelayClient {
#[cfg(target_arch="wasm32")]
relay_address: vec![
//NYC-1
"/dns4/nyc-3-dev.relay.satellite.im/tcp/4410/wss/p2p/12D3KooWKmRupXFyBqJtm6FAySPe6Krmi6v5i6SsQ96NMZ9J4Nns".parse().unwrap(),
"/dns4/nyc-3-dev.relay.satellite.im/tcp/4410/wss/p2p/12D3KooWJWw4KG2KKpUxQAc8kZZDqmownRvjWGxnr5Y6XRur8WSx".parse().unwrap(),
],
background: true,
quorum: Default::default()
Expand Down
14 changes: 7 additions & 7 deletions warp/src/constellation/directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -516,17 +516,17 @@ impl Directory {
}
let name = path.remove(0);
let item = self.get_item(name)?;
return match item {
match item {
Item::Directory(dir) => {
if path.is_empty() {
return Ok(dir);
}
return Ok(dir
Ok(dir
.get_last_directory_from_path(path.join("/").as_str())
.unwrap_or(dir));
.unwrap_or(dir))
}
_ => Err(Error::DirectoryNotFound),
};
}
}

/// Get an `Item` from a path
Expand Down Expand Up @@ -558,15 +558,15 @@ impl Directory {
}
let name = path.remove(0);
let item = self.get_item(name)?;
return match &item {
match &item {
Item::Directory(dir) => {
if path.is_empty() {
return Ok(item);
}
return dir.get_item_by_path(path.join("/").as_str());
dir.get_item_by_path(path.join("/").as_str())
}
_ => Ok(item),
};
}
}
}

Expand Down

0 comments on commit e5a4ae4

Please sign in to comment.