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

general clean up for network upgrade

Browse Source
This commit is contained in:
ghassmo
2022-05-10 06:43:04 +03:00
committed by parazyd
parent ea9a993e9b
commit 8287e0195f
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/tau/tau-cli/src/cli.rs
View File

@@ -1,5 +1,3 @@
use std::net::SocketAddr;
use serde::{Deserialize, Serialize};
use structopt::StructOpt;
use structopt_toml::StructOptToml;
@@ -17,8 +15,8 @@ pub struct CliTau {
#[structopt(short, parse(from_occurrences))]
pub verbose: u8,
/// JSON-RPC listen URL
#[structopt(long = "rpc", default_value = "127.0.0.1:11055")]
pub rpc_listen: SocketAddr,
#[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")]
pub rpc_listen: String,
/// Sets a custom config file
#[structopt(short, long)]
pub config: Option<String>,

3
bin/tau/taud/src/jsonrpc.rs
View File

@@ -1,6 +1,5 @@
use std::{path::PathBuf, sync::Arc};
use std::path::PathBuf;
use async_executor::Executor;
use async_trait::async_trait;
use log::debug;
use serde::{Deserialize, Serialize};

2
bin/tau/taud/src/settings.rs
View File

@@ -1,5 +1,3 @@
use std::net::SocketAddr;
use serde::Deserialize;
use structopt::StructOpt;
use structopt_toml::StructOptToml;

5
src/rpc/rpcserver.rs
View File

@@ -25,7 +25,6 @@ async fn run_accept_loop(
listener: Box<dyn TransportListener>,
rh: Arc<impl RequestHandler + 'static>,
) -> Result<()> {
// TODO can we spawn new task here ?
while let Ok((stream, peer_addr)) = listener.next().await {
info!(target: "JSON-RPC SERVER", "RPC Accepted connection {}", peer_addr);
accept(stream, rh.clone()).await?;
@@ -107,9 +106,11 @@ pub async fn listen_and_serve(
match upgrade {
None => {
info!("RPC TCP listening to: {}", accept_url);
run_accept_loop(Box::new(listener), rh).await?;
}
Some(u) if u == "tls" => {
info!("RPC TCP+TLS listening to: {}", accept_url);
let tls_listener = transport.upgrade_listener(listener)?.await?;
run_accept_loop(Box::new(tls_listener), rh).await?;
}
@@ -166,8 +167,10 @@ pub async fn listen_and_serve(
match upgrade {
None => {
run_accept_loop(Box::new(listener), rh).await?;
info!("RPC TOR listening to: {}", accept_url);
}
Some(u) if u == "tls" => {
info!("RPC TOR+TLS listening to: {}", accept_url);
let tls_listener = transport.upgrade_listener(listener)?.await?;
run_accept_loop(Box::new(tls_listener), rh).await?;
}