From 4e636d2f6750acccdcb43eae368e13a1af6a36dd Mon Sep 17 00:00:00 2001
From: ghassmo <ghxxm@protonmail.com>
Date: Fri, 10 Jun 2022 16:30:33 +0300
Subject: [PATCH] ircd, taud: explicit Url type in structopt

---
 bin/ircd/src/main.rs         | 3 +--
 bin/ircd/src/settings.rs     | 2 +-
 bin/tau/taud/src/main.rs     | 4 +---
 bin/tau/taud/src/settings.rs | 3 ++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bin/ircd/src/main.rs b/bin/ircd/src/main.rs
index 837a93eb9..5c63f82df 100644
--- a/bin/ircd/src/main.rs
+++ b/bin/ircd/src/main.rs
@@ -12,7 +12,6 @@ use log::{debug, error, info, warn};
 use rand::rngs::OsRng;
 use smol::future;
 use structopt_toml::StructOptToml;
-use url::Url;
 
 use darkfi::{
     async_daemonize, net,
@@ -202,7 +201,7 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
     //
     // RPC interface
     //
-    let rpc_listen_addr = Url::parse(&settings.rpc_listen)?;
+    let rpc_listen_addr = settings.rpc_listen.clone();
     let rpc_interface =
         Arc::new(JsonRpcInterface { addr: rpc_listen_addr.clone(), p2p: p2p.clone() });
     let rpc_task =
diff --git a/bin/ircd/src/settings.rs b/bin/ircd/src/settings.rs
index 818a0e3bb..2faf965ac 100644
--- a/bin/ircd/src/settings.rs
+++ b/bin/ircd/src/settings.rs
@@ -27,7 +27,7 @@ pub struct Args {
 
     /// JSON-RPC listen URL
     #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")]
-    pub rpc_listen: String,
+    pub rpc_listen: Url,
 
     /// IRC listen URL
     #[structopt(long = "irc", default_value = "tcp://127.0.0.1:11066")]
diff --git a/bin/tau/taud/src/main.rs b/bin/tau/taud/src/main.rs
index b821b6904..fab7c4643 100644
--- a/bin/tau/taud/src/main.rs
+++ b/bin/tau/taud/src/main.rs
@@ -7,7 +7,6 @@ use futures::{select, FutureExt};
 use log::{debug, error, info, warn};
 use smol::future;
 use structopt_toml::StructOptToml;
-use url::Url;
 
 use darkfi::{
     async_daemonize, net,
@@ -130,9 +129,8 @@ async fn realmain(settings: Args, executor: Arc<Executor<'_>>) -> Result<()> {
         Arc::new(JsonRpcInterface::new(rpc_snd, datastore_path.clone(), nickname.unwrap()));
 
     let executor_cloned = executor.clone();
-    let rpc_listener_url = Url::parse(&settings.rpc_listen)?;
     let rpc_listener_task =
-        executor_cloned.spawn(listen_and_serve(rpc_listener_url, rpc_interface));
+        executor_cloned.spawn(listen_and_serve(settings.rpc_listen.clone(), rpc_interface));
 
     let net_settings = settings.net;
 
diff --git a/bin/tau/taud/src/settings.rs b/bin/tau/taud/src/settings.rs
index 98dfffe64..02b00adf5 100644
--- a/bin/tau/taud/src/settings.rs
+++ b/bin/tau/taud/src/settings.rs
@@ -1,6 +1,7 @@
 use serde::Deserialize;
 use structopt::StructOpt;
 use structopt_toml::StructOptToml;
+use url::Url;
 
 use darkfi::net::settings::SettingsOpt;
 
@@ -17,7 +18,7 @@ pub struct Args {
     pub config: Option<String>,
     /// JSON-RPC listen URL
     #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")]
-    pub rpc_listen: String,
+    pub rpc_listen: Url,
     /// Sets Datastore Path
     #[structopt(long, default_value = "~/.config/tau")]
     pub datastore: String,