github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

net, rpc: cargo clippy clean up

Browse Source
This commit is contained in:
ghassmo
2022-05-11 07:53:36 +03:00
committed by parazyd
parent f0b8afc55b
commit 54e7ee21bc
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/acceptor.rs
View File

@@ -71,12 +71,12 @@ impl Acceptor {
TransportName::Tor(upgrade) => {
let socks5_url = Url::parse(
&env::var("DARKFI_TOR_SOCKS5_URL")
.unwrap_or("socks5://127.0.0.1:9050".to_string()),
.unwrap_or_else(|_| "socks5://127.0.0.1:9050".to_string()),
)?;
let torc_url = Url::parse(
&env::var("DARKFI_TOR_CONTROL_URL")
.unwrap_or("tcp://127.0.0.1:9051".to_string()),
.unwrap_or_else(|_| "tcp://127.0.0.1:9051".to_string()),
)?;
let auth_cookie = env::var("DARKFI_TOR_COOKIE");

2
src/net/connector.rs
View File

@@ -68,7 +68,7 @@ impl Connector {
TransportName::Tor(upgrade) => {
let socks5_url = Url::parse(
&env::var("DARKFI_TOR_SOCKS5_URL")
.unwrap_or("socks5://127.0.0.1:9050".to_string()),
.unwrap_or_else(|_| "socks5://127.0.0.1:9050".to_string()),
)?;
let transport = TorTransport::new(socks5_url, None)?;

26
src/net/settings.rs
View File

@@ -78,19 +78,19 @@ pub struct SettingsOpt {
pub channel_heartbeat_seconds: Option<u32>,
}
impl Into<Settings> for SettingsOpt {
fn into(self) -> Settings {
Settings {
inbound: self.inbound,
outbound_connections: self.outbound_connections.unwrap_or(0),
manual_attempt_limit: self.manual_attempt_limit.unwrap_or(0),
seed_query_timeout_seconds: self.seed_query_timeout_seconds.unwrap_or(8),
connect_timeout_seconds: self.connect_timeout_seconds.unwrap_or(10),
channel_handshake_seconds: self.channel_handshake_seconds.unwrap_or(4),
channel_heartbeat_seconds: self.channel_heartbeat_seconds.unwrap_or(10),
external_addr: self.external_addr,
peers: self.peers,
seeds: self.seeds,
impl From<SettingsOpt> for Settings {
fn from(settings_opt: SettingsOpt) -> Self {
Self {
inbound: settings_opt.inbound,
outbound_connections: settings_opt.outbound_connections.unwrap_or(0),
manual_attempt_limit: settings_opt.manual_attempt_limit.unwrap_or(0),
seed_query_timeout_seconds: settings_opt.seed_query_timeout_seconds.unwrap_or(8),
connect_timeout_seconds: settings_opt.connect_timeout_seconds.unwrap_or(10),
channel_handshake_seconds: settings_opt.channel_handshake_seconds.unwrap_or(4),
channel_heartbeat_seconds: settings_opt.channel_heartbeat_seconds.unwrap_or(10),
external_addr: settings_opt.external_addr,
peers: settings_opt.peers,
seeds: settings_opt.seeds,
}
}
}

7
src/rpc/jsonrpc.rs
View File

@@ -187,12 +187,13 @@ pub async fn send_request(uri: &Url, data: Value) -> Result<JsonResult> {
let mut stream = transport.upgrade_dialer(stream?)?.await?;
get_reply(&mut stream, data_str).await
}
Some(u) => return Err(Error::UnsupportedTransportUpgrade(u)),
Some(u) => Err(Error::UnsupportedTransportUpgrade(u)),
}
}
TransportName::Tor(upgrade) => {
let socks5_url = Url::parse(
&env::var("DARKFI_TOR_SOCKS5_URL").unwrap_or("socks5://127.0.0.1:9050".to_string()),
&env::var("DARKFI_TOR_SOCKS5_URL")
.unwrap_or_else(|_| "socks5://127.0.0.1:9050".to_string()),
)?;
let transport = TorTransport::new(socks5_url, None)?;
@@ -217,7 +218,7 @@ pub async fn send_request(uri: &Url, data: Value) -> Result<JsonResult> {
let mut stream = transport.upgrade_dialer(stream?)?.await?;
get_reply(&mut stream, data_str).await
}
Some(u) => return Err(Error::UnsupportedTransportUpgrade(u)),
Some(u) => Err(Error::UnsupportedTransportUpgrade(u)),
}
}
TransportName::Unix => {

6
src/rpc/rpcserver.rs
View File

@@ -120,11 +120,13 @@ pub async fn listen_and_serve(
}
TransportName::Tor(upgrade) => {
let socks5_url = Url::parse(
&env::var("DARKFI_TOR_SOCKS5_URL").unwrap_or("socks5://127.0.0.1:9050".to_string()),
&env::var("DARKFI_TOR_SOCKS5_URL")
.unwrap_or_else(|_| "socks5://127.0.0.1:9050".to_string()),
)?;
let torc_url = Url::parse(
&env::var("DARKFI_TOR_CONTROL_URL").unwrap_or("tcp://127.0.0.1:9051".to_string()),
&env::var("DARKFI_TOR_CONTROL_URL")
.unwrap_or_else(|_| "tcp://127.0.0.1:9051".to_string()),
)?;
let auth_cookie = env::var("DARKFI_TOR_COOKIE");