From 8287e0195f0060786a977720b0def4e50238d93a Mon Sep 17 00:00:00 2001
From: ghassmo <ghxxm@protonmail.com>
Date: Tue, 10 May 2022 06:43:04 +0300
Subject: [PATCH] general clean up for network upgrade

---
 bin/tau/tau-cli/src/cli.rs   | 6 ++----
 bin/tau/taud/src/jsonrpc.rs  | 3 +--
 bin/tau/taud/src/settings.rs | 2 --
 src/rpc/rpcserver.rs         | 5 ++++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bin/tau/tau-cli/src/cli.rs b/bin/tau/tau-cli/src/cli.rs
index d215ca3f7..01fed20ac 100644
--- a/bin/tau/tau-cli/src/cli.rs
+++ b/bin/tau/tau-cli/src/cli.rs
@@ -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>,
diff --git a/bin/tau/taud/src/jsonrpc.rs b/bin/tau/taud/src/jsonrpc.rs
index a9bd622de..b05c88cec 100644
--- a/bin/tau/taud/src/jsonrpc.rs
+++ b/bin/tau/taud/src/jsonrpc.rs
@@ -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};
diff --git a/bin/tau/taud/src/settings.rs b/bin/tau/taud/src/settings.rs
index 46fb8567c..98dfffe64 100644
--- a/bin/tau/taud/src/settings.rs
+++ b/bin/tau/taud/src/settings.rs
@@ -1,5 +1,3 @@
-use std::net::SocketAddr;
-
 use serde::Deserialize;
 use structopt::StructOpt;
 use structopt_toml::StructOptToml;
diff --git a/src/rpc/rpcserver.rs b/src/rpc/rpcserver.rs
index a0b6f1f3d..30cb162f2 100644
--- a/src/rpc/rpcserver.rs
+++ b/src/rpc/rpcserver.rs
@@ -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?;
                 }