diff --git a/src/connections.rs b/src/connections.rs index db2f3852..a495a744 100644 --- a/src/connections.rs +++ b/src/connections.rs @@ -11,7 +11,7 @@ use crate::Endpoint; use super::{ connection_pool::{ConnId, ConnectionPool, ConnectionRemover}, - error::{ConnectionError, Error, RecvError, Result, SendError, SerializationError}, + error::{ConnectionError, Error, RecvError, SendError, SerializationError}, wire_msg::WireMsg, }; use bytes::Bytes; @@ -263,7 +263,7 @@ async fn read_on_uni_streams( uni_streams: &mut quinn::IncomingUniStreams, peer_addr: SocketAddr, message_tx: Sender<(SocketAddr, Bytes)>, -) -> Result<()> { +) -> Result<(), Error> { while let Some(result) = uni_streams.next().await { match result { Err(error @ quinn::ConnectionError::ConnectionClosed(_)) => { @@ -308,7 +308,7 @@ async fn read_on_bi_streams( peer_addr: SocketAddr, message_tx: Sender<(SocketAddr, Bytes)>, endpoint: &Endpoint, -) -> Result<()> { +) -> Result<(), Error> { while let Some(result) = bi_streams.next().await { match result { Err(error @ quinn::ConnectionError::ConnectionClosed(_)) => { @@ -379,7 +379,7 @@ async fn read_on_bi_streams( async fn handle_endpoint_echo_req( peer_addr: SocketAddr, send_stream: &mut quinn::SendStream, -) -> Result<()> { +) -> Result<(), Error> { trace!("Received Echo Request from peer {:?}", peer_addr); let message = WireMsg::EndpointEchoResp(peer_addr); message.write_to_stream(send_stream).await?; @@ -392,7 +392,7 @@ async fn handle_endpoint_verification_req( addr_sent: SocketAddr, send_stream: &mut quinn::SendStream, endpoint: &Endpoint, -) -> Result<()> { +) -> Result<(), Error> { trace!( "Received Endpoint verification request {:?} from {:?}", addr_sent, diff --git a/src/endpoint.rs b/src/endpoint.rs index d2d78b0e..1eed9ca8 100644 --- a/src/endpoint.rs +++ b/src/endpoint.rs @@ -22,8 +22,8 @@ use super::{ DisconnectionEvents, RecvStream, SendStream, }, error::{ - ClientEndpointError, ConnectionError, EndpointError, RecvError, Result, RpcError, - SendError, SerializationError, + ClientEndpointError, ConnectionError, EndpointError, RecvError, RpcError, SendError, + SerializationError, }, }; use backoff::{future::retry, ExponentialBackoff}; @@ -351,7 +351,7 @@ impl Endpoint { /// Verify if an address is publicly reachable. This will attempt to create /// a new connection and use it to exchange a message and verify that the node /// can be reached. - pub async fn is_reachable(&self, peer_addr: &SocketAddr) -> Result<()> { + pub async fn is_reachable(&self, peer_addr: &SocketAddr) -> Result<(), Error> { trace!("Checking is reachable"); let connection = self.get_or_connect_to(peer_addr).await?; let (mut send_stream, mut recv_stream) = connection.open_bi(0).await?; @@ -413,7 +413,7 @@ impl Endpoint { msg: Bytes, dest: &SocketAddr, priority: i32, - ) -> Result<()> { + ) -> Result<(), Error> { if let Some((conn, guard)) = self.connection_pool.get_by_addr(dest).await { trace!("Connection exists in the connection pool: {}", dest); let connection = Connection::new(conn, guard); diff --git a/src/error.rs b/src/error.rs index b3cb1532..1f842592 100644 --- a/src/error.rs +++ b/src/error.rs @@ -15,9 +15,6 @@ use bytes::Bytes; use std::{fmt, io, net::SocketAddr}; use thiserror::Error; -/// Result used by `QuicP2p`. -pub type Result = std::result::Result; - /// Error types returned by the qp2p public API. #[derive(Debug, Error)] #[non_exhaustive] diff --git a/src/lib.rs b/src/lib.rs index 9e8f0843..fd246a2d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -66,7 +66,7 @@ pub use endpoint::{Endpoint, IncomingConnections, IncomingMessages}; pub use error::UpnpError; pub use error::{ ClientEndpointError, Close, ConnectionError, EndpointError, Error, InternalConfigError, - RecvError, Result, RpcError, SendError, SerializationError, StreamError, TransportErrorCode, + RecvError, RpcError, SendError, SerializationError, StreamError, TransportErrorCode, UnsupportedStreamOperation, }; diff --git a/src/wire_msg.rs b/src/wire_msg.rs index a9ca3361..4c5aa748 100644 --- a/src/wire_msg.rs +++ b/src/wire_msg.rs @@ -8,7 +8,7 @@ // Software. use crate::{ - error::{RecvError, Result, SendError, SerializationError}, + error::{RecvError, SendError, SerializationError}, utils, }; use bytes::Bytes;