fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-27 00:31:35 +00:00
Code Issues Projects Releases Wiki Activity

Use UpgradeError::into_io_error (#709)

Browse Source 
* Use UpgradeError::into_io_error

* Update core/src/transport/upgrade.rs

Co-Authored-By: dvdplm <dvdplm@gmail.com>

* Update core/src/transport/upgrade.rs

Co-Authored-By: dvdplm <dvdplm@gmail.com>
This commit is contained in:
David
2018-11-30 08:34:04 +01:00
committed by Pierre Krieger
parent 090ecb88e4
commit b269d6184e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/transport/upgrade.rs
View File

@ -22,7 +22,7 @@ use futures::prelude::*;
use multiaddr::Multiaddr; use multiaddr::Multiaddr;
use crate::{ use crate::{
transport::Transport, transport::Transport,
upgrade::{OutboundUpgrade, InboundUpgrade, UpgradeInfo, apply_inbound, apply_outbound} upgrade::{OutboundUpgrade, InboundUpgrade, UpgradeInfo, apply_inbound, apply_outbound, UpgradeError}
}; };
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
@ -60,9 +60,9 @@ where
match self.inner.dial(addr.clone()) { match self.inner.dial(addr.clone()) {
Ok(outbound) => { Ok(outbound) => {
let future = outbound let future = outbound
.and_then(move |x| apply_outbound(x, upgrade).map_err(|e| { .and_then(move |x| {
std::io::Error::new(std::io::ErrorKind::Other, e) apply_outbound(x, upgrade).map_err(UpgradeError::into_io_error)
})); });
Ok(Box::new(future)) Ok(Box::new(future))
} }
Err((dialer, addr)) => Err((Upgrade::new(dialer, upgrade), addr)) Err((dialer, addr)) => Err((Upgrade::new(dialer, upgrade), addr))
@ -77,9 +77,9 @@ where
.map(move |(future, addr)| { .map(move |(future, addr)| {
let upgrade = upgrade.clone(); let upgrade = upgrade.clone();
let future = future let future = future
.and_then(move |x| apply_inbound(x, upgrade).map_err(|e| { .and_then(move |x| {
std::io::Error::new(std::io::ErrorKind::Other, e) apply_inbound(x, upgrade).map_err(UpgradeError::into_io_error)
})); });
(Box::new(future) as Box<_>, addr) (Box::new(future) as Box<_>, addr)
}); });
Ok((Box::new(stream), addr)) Ok((Box::new(stream), addr))