Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 06:59:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make use of torut's errors implementing std::error::Error

Browse Source 
Anyhow all the things!
This commit is contained in:
Thomas Eizinger 2021-07-06 14:46:00 +10:00
parent dcd854e697
commit c2daf7a11e
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swap/src/tor.rs
View File

@ -1,4 +1,4 @@
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{bail, Context, Result};
use std::future::Future; use std::future::Future;
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4}; use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
use tokio::net::TcpStream; use tokio::net::TcpStream;
@ -50,7 +50,7 @@ impl Client {
pub async fn assert_tor_running(&self) -> Result<()> { pub async fn assert_tor_running(&self) -> Result<()> {
// Make sure you are running tor and this is your socks port // Make sure you are running tor and this is your socks port
let proxy = reqwest::Proxy::all(format!("socks5h://{}", self.socks5_address).as_str()) let proxy = reqwest::Proxy::all(format!("socks5h://{}", self.socks5_address).as_str())
.map_err(|_| anyhow!("tor proxy should be there"))?; .context("Failed to construct Tor proxy URL")?;
let client = reqwest::Client::builder().proxy(proxy).build()?; let client = reqwest::Client::builder().proxy(proxy).build()?;
let res = client.get("https://check.torproject.org").send().await?; let res = client.get("https://check.torproject.org").send().await?;
@ -77,21 +77,21 @@ impl Client {
let mut uc = self let mut uc = self
.init_unauthenticated_connection() .init_unauthenticated_connection()
.await .await
.map_err(|_| anyhow!("Could not connect to Tor. Tor might not be running or the control port is incorrect."))?; .context("Failed to connect to Tor")?;
let tor_info = uc let tor_info = uc
.load_protocol_info() .load_protocol_info()
.await .await
.map_err(|_| anyhow!("Failed to load protocol info from Tor."))?; .context("Failed to load protocol info from Tor")?;
let tor_auth_data = tor_info let tor_auth_data = tor_info
.make_auth_data()? .make_auth_data()?
.context("Failed to make Tor auth data.")?; .context("Failed to make Tor auth data")?;
// Get an authenticated connection to the Tor via the Tor Controller protocol. // Get an authenticated connection to the Tor via the Tor Controller protocol.
uc.authenticate(&tor_auth_data) uc.authenticate(&tor_auth_data)
.await .await
.map_err(|_| anyhow!("Failed to authenticate with Tor"))?; .context("Failed to authenticate with Tor")?;
Ok(AuthenticatedClient { Ok(AuthenticatedClient {
inner: uc.into_authenticated().await, inner: uc.into_authenticated().await,
@ -123,6 +123,6 @@ impl AuthenticatedClient {
self.inner self.inner
.add_onion_v3(tor_key, false, false, false, None, &mut listeners) .add_onion_v3(tor_key, false, false, false, None, &mut listeners)
.await .await
.map_err(|e| anyhow!("Could not add onion service.: {:#?}", e)) .context("Failed to add onion service")
} }
} }