From 8560d3c7a6308d815d62e55b64683720b9386181 Mon Sep 17 00:00:00 2001 From: 2075 Date: Tue, 17 Mar 2020 17:29:57 +0100 Subject: update implementation to use parity-multiaddr --- ipfs-api/src/client.rs | 10 +++++----- 1 file 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 = None; let mut port: Option = 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; } -- cgit v1.2.3