summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author2075 <marco@one.io>2020-03-17 17:29:57 +0100
committer2075 <marco@one.io>2020-03-17 17:29:57 +0100
commit8560d3c7a6308d815d62e55b64683720b9386181 (patch)
tree3708620e18cd9a867c57d7743fea12e4b926a891
parente77b04837ceb0c6bb1657da6087df8b920c98410 (diff)
update implementation to use parity-multiaddr
-rw-r--r--ipfs-api/src/client.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index 1072a33..1980546 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -26,7 +26,7 @@ use hyper::{body, client::Builder};
use hyper_multipart::client::multipart;
#[cfg(feature = "hyper")]
use hyper_tls::HttpsConnector;
-use multiaddr::{AddrComponent, ToMultiaddr};
+use parity_multiaddr::{Protocol};
use serde::{Deserialize, Serialize};
use serde_json;
use std::{
@@ -55,15 +55,15 @@ impl Default for IpfsClient {
dirs::home_dir()
.map(|home_dir| home_dir.join(".ipfs").join("api"))
.and_then(|multiaddr_path| fs::read_to_string(&multiaddr_path).ok())
- .and_then(|multiaddr_str| multiaddr_str.to_multiaddr().ok())
+ .and_then(|multiaddr_str| parity_multiaddr::from_url(&multiaddr_str).ok())
.and_then(|multiaddr| {
let mut addr: Option<IpAddr> = None;
let mut port: Option<u16> = None;
for addr_component in multiaddr.iter() {
match addr_component {
- AddrComponent::IP4(v4addr) => addr = Some(v4addr.into()),
- AddrComponent::IP6(v6addr) => addr = Some(v6addr.into()),
- AddrComponent::TCP(tcpport) => port = Some(tcpport),
+ Protocol::Ip4(v4addr) => addr = Some(v4addr.into()),
+ Protocol::Ip6(v6addr) => addr = Some(v6addr.into()),
+ Protocol::Tcp(tcpport) => port = Some(tcpport),
_ => {
return None;
}